svn commit: r275394 - in head/sys: net netinet6

[Andrey V. Elsukov]

Author: ae
Date: Tue Dec  2 05:41:03 2014
New Revision: 275394
URL: https://svnweb.freebsd.org/changeset/base/275394

Log:
  Remove unneded check. No need to do m_pullup to the size that we prepended.
  
  MFC after:	1 week
  Sponsored by:	Yandex LLC

Modified:
  head/sys/net/if_stf.c
  head/sys/netinet6/icmp6.c

Modified: head/sys/net/if_stf.c
==============================================================================
--- head/sys/net/if_stf.c	Tue Dec  2 05:28:40 2014	(r275393)
+++ head/sys/net/if_stf.c	Tue Dec  2 05:41:03 2014	(r275394)
@@ -482,8 +482,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) {
 		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return ENOBUFS;

Modified: head/sys/netinet6/icmp6.c
==============================================================================
--- head/sys/netinet6/icmp6.c	Tue Dec  2 05:28:40 2014	(r275393)
+++ head/sys/netinet6/icmp6.c	Tue Dec  2 05:41:03 2014	(r275394)
@@ -363,8 +363,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;