Date: Tue, 16 Dec 2014 11:52:17 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r275827 - in stable/9/sys: net netinet6 Message-ID: <201412161152.sBGBqH6O040031@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Tue Dec 16 11:52:15 2014 New Revision: 275827 URL: https://svnweb.freebsd.org/changeset/base/275827 Log: MFC r275394: Remove unneded check. No need to do m_pullup to the size that we prepended. Sponsored by: Yandex LLC Modified: stable/9/sys/net/if_stf.c stable/9/sys/netinet6/icmp6.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/net/ (props changed) Modified: stable/9/sys/net/if_stf.c ============================================================================== --- stable/9/sys/net/if_stf.c Tue Dec 16 11:49:35 2014 (r275826) +++ stable/9/sys/net/if_stf.c Tue Dec 16 11:52:15 2014 (r275827) @@ -511,8 +511,6 @@ stf_output(ifp, m, dst, ro) } M_PREPEND(m, sizeof(struct ip), M_DONTWAIT); - if (m && m->m_len < sizeof(struct ip)) - m = m_pullup(m, sizeof(struct ip)); if (m == NULL) { ifa_free(&ia6->ia_ifa); ifp->if_oerrors++; Modified: stable/9/sys/netinet6/icmp6.c ============================================================================== --- stable/9/sys/netinet6/icmp6.c Tue Dec 16 11:49:35 2014 (r275826) +++ stable/9/sys/netinet6/icmp6.c Tue Dec 16 11:52:15 2014 (r275827) @@ -361,8 +361,6 @@ icmp6_error(struct mbuf *m, int type, in preplen = sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr); M_PREPEND(m, preplen, M_DONTWAIT); /* FIB is also copied over. */ - if (m && m->m_len < preplen) - m = m_pullup(m, preplen); if (m == NULL) { nd6log((LOG_DEBUG, "ENOBUFS in icmp6_error %d\n", __LINE__)); return;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412161152.sBGBqH6O040031>