diff options
| author |   angelos <angelos@openbsd.org> | 2001-06-25 02:54:44 +0000 |
|---|---|---|
| committer | angelos <angelos@openbsd.org> | 2001-06-25 02:54:44 +0000 |
| commit | f3c382ff393b45696a292da1b55d2c8b8b51ff6c (patch) | |
| tree | 0df21abeca3267f6998604798ab5e4cad9a5b68e | |
| parent | close_log() (diff) | |
| download | wireguard-openbsd-f3c382ff393b45696a292da1b55d2c8b8b51ff6c.tar.xz wireguard-openbsd-f3c382ff393b45696a292da1b55d2c8b8b51ff6c.zip | |
Don't double-clear M_PKTHDR/tags.
| -rw-r--r-- | sys/netinet/ip_ether.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_output.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/icmp6.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/ip6_output.c | 4 | ||||
| -rw-r--r-- | sys/netiso/tuba_subr.c | 4 |
5 files changed, 5 insertions, 15 deletions
diff --git a/sys/netinet/ip_ether.c b/sys/netinet/ip_ether.c index cfb868eeaff..d41a90c87bd 100644 --- a/sys/netinet/ip_ether.c +++ b/sys/netinet/ip_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ether.c,v 1.30 2001/06/23 16:15:56 fgsch Exp $ */ +/* $OpenBSD: ip_ether.c,v 1.31 2001/06/25 02:54:44 angelos Exp $ */ /* * The author of this code is Angelos D. Keromytis (kermit@adk.gr) @@ -349,8 +349,6 @@ etherip_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip, m0->m_next = m; m0->m_len = hlen; m0->m_pkthdr.len += hlen; - m_tag_init(m); - m->m_flags &= ~M_PKTHDR; m = m0; /* Statistics */ diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 686960487af..e347ec543c1 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.122 2001/06/25 02:03:18 angelos Exp $ */ +/* $OpenBSD: ip_output.c,v 1.123 2001/06/25 02:54:44 angelos Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -874,8 +874,6 @@ ip_insertoptions(m, opt, phlen) if (n == 0) return (m); M_COPY_HDR(n, m); - m_tag_init(m); - m->m_flags &= ~M_PKTHDR; n->m_pkthdr.len = m->m_pkthdr.len + optlen; m->m_len -= sizeof(struct ip); m->m_data += sizeof(struct ip); diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 5362f184a3b..e9ca365a1e0 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp6.c,v 1.44 2001/06/22 12:59:08 itojun Exp $ */ +/* $OpenBSD: icmp6.c,v 1.45 2001/06/25 02:59:01 angelos Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -627,8 +627,6 @@ icmp6_input(mp, offp, proto) m_adj(n0, off + sizeof(struct icmp6_hdr)); n->m_pkthdr.len += n0->m_pkthdr.len; n->m_next = n0; - n0->m_flags &= ~M_PKTHDR; - m_tag_init(n0); } else { nip6 = mtod(n, struct ip6_hdr *); nicmp6 = (struct icmp6_hdr *)((caddr_t)nip6 + off); diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 0071b2d0922..d94882e8a80 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_output.c,v 1.41 2001/06/09 06:43:38 angelos Exp $ */ +/* $OpenBSD: ip6_output.c,v 1.42 2001/06/25 02:59:02 angelos Exp $ */ /* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */ /* @@ -2303,8 +2303,6 @@ ip6_splithdr(m, exthdrs) } M_COPY_PKTHDR(mh, m); MH_ALIGN(mh, sizeof(*ip6)); - m->m_flags &= ~M_PKTHDR; - m_tag_init(m); m->m_len -= sizeof(*ip6); m->m_data += sizeof(*ip6); mh->m_next = m; diff --git a/sys/netiso/tuba_subr.c b/sys/netiso/tuba_subr.c index f665734b793..e91a1f86e18 100644 --- a/sys/netiso/tuba_subr.c +++ b/sys/netiso/tuba_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tuba_subr.c,v 1.7 2001/05/27 12:26:06 angelos Exp $ */ +/* $OpenBSD: tuba_subr.c,v 1.8 2001/06/25 02:57:23 angelos Exp $ */ /* $NetBSD: tuba_subr.c,v 1.7 1996/02/13 22:12:32 christos Exp $ */ /* @@ -330,8 +330,6 @@ tuba_tcpinput(m, va_alist) goto drop; } M_COPY_PKTHDR(m, m0); - m_tag_init(m0); - m0->m_flags &= ~M_PKTHDR; m->m_next = m0; m->m_data += max_linkhdr; if (len < sizeof(struct tcphdr)) { |