diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2001-06-25 02:59:03 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2001-06-25 02:59:03 +0000 |
| commit | d67fa24a6eb45d8a72a2ec3ebfe54d38e6965885 (patch) | |
| tree | 94440e6b5ddad58c0f7512a669a1f8776b47a49f | |
| parent | ccf6d37984ba520ee039693cbb8c70762e0d3aeb (diff) | |
Don't double-clear M_PKTHDR/tags.
| -rw-r--r-- | sys/netinet6/icmp6.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/ip6_output.c | 4 |
2 files changed, 2 insertions, 6 deletions
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; |