summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-05-27 12:29:24 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-05-27 12:29:24 +0000
commit6258733b0d9142ea3d5b7daa808f803e97069bd9 (patch)
treeb395fe1689e75d4d5b2e4d1204a9afb22a9e7c91 /sys
parentf05c66782e5f198be244db4c822c89015f239fe3 (diff)
Yup, more tag fixups.
Diffstat (limited to 'sys')
-rw-r--r--sys/netns/ns_ip.c8
-rw-r--r--sys/netns/spp_usrreq.c5
2 files changed, 8 insertions, 5 deletions
diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c
index 86a2e785ed7..4d136b90099 100644
--- a/sys/netns/ns_ip.c
+++ b/sys/netns/ns_ip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ns_ip.c,v 1.11 2001/05/22 19:07:12 angelos Exp $ */
+/* $OpenBSD: ns_ip.c,v 1.12 2001/05/27 12:29:23 angelos Exp $ */
/* $NetBSD: ns_ip.c,v 1.16 1996/05/09 22:29:40 scottr Exp $ */
/*
@@ -285,14 +285,14 @@ nsipoutput(ifp, m, dst, rt)
m_freem(m);
return (ENOBUFS);
}
+ M_COPY_HDR(m0, m);
+ m->m_flags &= ~M_PKTHDR;
+ m_tag_init(m);
MH_ALIGN(m0, sizeof (struct ip));
m0->m_flags = m->m_flags & M_COPYFLAGS;
m0->m_next = m;
m0->m_len = sizeof (struct ip);
m0->m_pkthdr.len = m0->m_len + m->m_len;
- m0->m_pkthdr.tags = m->m_pkthdr.tags;
- m->m_flags &= ~M_PKTHDR;
- TAILQ_INIT(&m->m_pkthdr.tags);
} else {
M_PREPEND(m, sizeof (struct ip), M_DONTWAIT);
if (m == 0)
diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c
index c5164d049ab..ca691744b84 100644
--- a/sys/netns/spp_usrreq.c
+++ b/sys/netns/spp_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spp_usrreq.c,v 1.8 1999/01/11 05:12:35 millert Exp $ */
+/* $OpenBSD: spp_usrreq.c,v 1.9 2001/05/27 12:29:23 angelos Exp $ */
/* $NetBSD: spp_usrreq.c,v 1.9 1996/02/13 22:14:13 christos Exp $ */
/*
@@ -848,6 +848,9 @@ spp_output(m0, va_alist)
* Fill in mbuf with extended SP header
* and addresses and length put into network format.
*/
+ M_COPY_HDR(m, m0);
+ m0->m_flags &= ~M_PKTHDR;
+ m_tag_init(m0);
MH_ALIGN(m, sizeof (struct spidp));
m->m_len = sizeof (struct spidp);
m->m_next = m0;