From 2dfcd0ae9d9b78d5f0d861a3f85f20a96ec62793 Mon Sep 17 00:00:00 2001 From: "Andrey V. Elsukov" Date: Tue, 2 Dec 2014 05:41:03 +0000 Subject: [PATCH] Remove unneded check. No need to do m_pullup to the size that we prepended. MFC after: 1 week Sponsored by: Yandex LLC --- sys/net/if_stf.c | 2 -- sys/netinet6/icmp6.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c index 00e34a236a99..f3a604255ddd 100644 --- a/sys/net/if_stf.c +++ b/sys/net/if_stf.c @@ -482,8 +482,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) { if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); return ENOBUFS; diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 0105479dcf54..6ef0d445b402 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -363,8 +363,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;