Author: ae
Date: Tue Dec 16 11:53:45 2014
New Revision: 275828
URL: https://svnweb.freebsd.org/changeset/base/275828
Log:
MFC r275394:
Remove unneded check. No need to do m_pullup to the size that we prepended.
Sponsored by: Yandex LLC
Modified:
stable/10/sys/net/if_stf.c
stable/10/sys/netinet6/icmp6.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/net/if_stf.c
==============================================================================
--- stable/10/sys/net/if_stf.c Tue Dec 16 11:52:15 2014 (r275827)
+++ stable/10/sys/net/if_stf.c Tue Dec 16 11:53:45 2014 (r275828)
@@ -499,8 +499,6 @@ stf_output(struct ifnet *ifp, struct mbu
}
M_PREPEND(m, sizeof(struct ip), M_NOWAIT);
- 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/10/sys/netinet6/icmp6.c
==============================================================================
--- stable/10/sys/netinet6/icmp6.c Tue Dec 16 11:52:15 2014
(r275827)
+++ stable/10/sys/netinet6/icmp6.c Tue Dec 16 11:53:45 2014
(r275828)
@@ -366,8 +366,6 @@ icmp6_error(struct mbuf *m, int type, in
preplen = sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr);
M_PREPEND(m, preplen, M_NOWAIT); /* 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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
