aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAndrey V. Elsukov <ae@FreeBSD.org>2014-10-24 13:34:22 +0000
committerAndrey V. Elsukov <ae@FreeBSD.org>2014-10-24 13:34:22 +0000
commita663aa4ce80525e8c165c59788bb205cc5a869ae (patch)
treec519b44bdce4663f9ea86fb3d90857aec8ec8fc6 /sys
parent382a5cbf423a65c5504a421776412b26daa9e949 (diff)
downloadsrc-a663aa4ce80525e8c165c59788bb205cc5a869ae.tar.gz
src-a663aa4ce80525e8c165c59788bb205cc5a869ae.zip
Remove redundant check and m_pullup() call.
Notes
Notes: svn path=/head/; revision=273587
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if_gif.c2
-rw-r--r--sys/netinet/in_gif.c2
-rw-r--r--sys/netinet6/in6_gif.c2
3 files changed, 0 insertions, 6 deletions
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index 94ecdabd673f..a98fb19c8cf6 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -400,8 +400,6 @@ gif_transmit(struct ifnet *ifp, struct mbuf *m)
case AF_LINK:
proto = IPPROTO_ETHERIP;
M_PREPEND(m, sizeof(struct etherip_header), M_NOWAIT);
- if (m != NULL && m->m_len < sizeof(struct etherip_header))
- m = m_pullup(m, sizeof(struct etherip_header));
if (m == NULL) {
error = ENOBUFS;
goto err;
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 3a139f80de0d..59a5b8b3336f 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -103,8 +103,6 @@ in_gif_output(struct ifnet *ifp, struct mbuf *m, int proto, uint8_t ecn)
len += ETHERIP_ALIGN;
#endif
M_PREPEND(m, len, M_NOWAIT);
- if (m != NULL && m->m_len < len)
- m = m_pullup(m, len);
if (m == NULL)
return (ENOBUFS);
#ifndef __NO_STRICT_ALIGNMENT
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index 6d48b5da8fb7..d0cbedc88ea6 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -111,8 +111,6 @@ in6_gif_output(struct ifnet *ifp, struct mbuf *m, int proto, uint8_t ecn)
len += ETHERIP_ALIGN;
#endif
M_PREPEND(m, len, M_NOWAIT);
- if (m != NULL && m->m_len < len)
- m = m_pullup(m, len);
if (m == NULL)
return (ENOBUFS);
#ifndef __NO_STRICT_ALIGNMENT