summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorae <ae@FreeBSD.org>2014-12-16 11:53:45 +0000
committerae <ae@FreeBSD.org>2014-12-16 11:53:45 +0000
commit3e533b737944236ce879650c2623e342604193e0 (patch)
tree87076ab1e484a84035427e5fda2289c4944a993d
parent257146dad418dd27229c22880997bbc505ee2e07 (diff)
downloadFreeBSD-src-3e533b737944236ce879650c2623e342604193e0.zip
FreeBSD-src-3e533b737944236ce879650c2623e342604193e0.tar.gz
MFC r275394:
Remove unneded check. No need to do m_pullup to the size that we prepended. Sponsored by: Yandex LLC
-rw-r--r--sys/net/if_stf.c2
-rw-r--r--sys/netinet6/icmp6.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index 20251dc..15d7d64 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -499,8 +499,6 @@ stf_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
}
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++;
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index de9d2fe..abf1a0a 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -366,8 +366,6 @@ icmp6_error(struct mbuf *m, int type, int code, int param)
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;
OpenPOWER on IntegriCloud