Convert from tdbi to packet tags.

5 files changed, 12 insertions, 12 deletions

diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 99f1df22bf4..389d987561b 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp6.c,v 1.39 2001/04/04 06:03:45 itojun Exp $	*/
+/*	$OpenBSD: icmp6.c,v 1.40 2001/05/20 08:36:01 angelos Exp $	*/
 /*	$KAME: icmp6.c,v 1.205 2001/03/21 07:48:57 itojun Exp $	*/
 
 /*
@@ -634,7 +634,7 @@ icmp6_input(mp, offp, proto)
 			n->m_pkthdr.len += n0->m_pkthdr.len;
 			n->m_next = n0;
 			n0->m_flags &= ~M_PKTHDR;
-			n0->m_pkthdr.tdbi = NULL;
+			TAILQ_INIT(&n0->m_pkthdr.tags);
 		} 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 7fa15e90167..4c369ebe229 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_output.c,v 1.33 2001/05/16 12:53:36 ho Exp $	*/
+/*	$OpenBSD: ip6_output.c,v 1.34 2001/05/20 08:36:01 angelos Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 
 /*
@@ -2334,7 +2334,7 @@ ip6_splithdr(m, exthdrs)
 		M_COPY_PKTHDR(mh, m);
 		MH_ALIGN(mh, sizeof(*ip6));
 		m->m_flags &= ~M_PKTHDR;
-		m->m_pkthdr.tdbi = NULL;
+		TAILQ_INIT(&m->m_pkthdr.tags);
 		m->m_len -= sizeof(*ip6);
 		m->m_data += sizeof(*ip6);
 		mh->m_next = m;
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c
index 0f04ea21a9b..dcb5a5d04ad 100644
--- a/sys/netipx/ipx_ip.c
+++ b/sys/netipx/ipx_ip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipx_ip.c,v 1.8 2001/03/23 07:33:47 angelos Exp $	*/
+/*	$OpenBSD: ipx_ip.c,v 1.9 2001/05/20 08:36:02 angelos Exp $	*/
 
 /*-
  *
@@ -278,9 +278,9 @@ ipxipoutput(ifp, m, dst, rt)
 		m0->m_next = m;
 		m0->m_len = sizeof(struct ip);
 		m0->m_pkthdr.len = m0->m_len + m->m_len;
-		m0->m_pkthdr.tdbi = m->m_pkthdr.tdbi;
+		m0->m_pkthdr.tags = m->m_pkthdr.tags;
 		m->m_flags &= ~M_PKTHDR;
-		m->m_pkthdr.tdbi = NULL;
+		TAILQ_INIT(&m->m_pkthdr.tags);
 	} else {
 		M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
 		if (m == NULL)
diff --git a/sys/netiso/tuba_subr.c b/sys/netiso/tuba_subr.c
index 37413a63a9d..126189076ea 100644
--- a/sys/netiso/tuba_subr.c
+++ b/sys/netiso/tuba_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tuba_subr.c,v 1.5 2001/03/23 07:34:31 angelos Exp $	*/
+/*	$OpenBSD: tuba_subr.c,v 1.6 2001/05/20 08:36:02 angelos Exp $	*/
 /*	$NetBSD: tuba_subr.c,v 1.7 1996/02/13 22:12:32 christos Exp $	*/
 
 /*
@@ -333,7 +333,7 @@ tuba_tcpinput(m, va_alist)
 		m->m_next = m0;
 		m->m_data += max_linkhdr;
 		m0->m_flags &= ~M_PKTHDR;
-		m0->m_pkthdr.tdbi = NULL;
+		TAILQ_INIT(&m0->m_pkthdr.tags);
 		if (len < sizeof(struct tcphdr)) {
 			m->m_len = 0;
 			if ((m = m_pullup(m, sizeof(struct tcpiphdr))) == 0) {
diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c
index b3994630d28..6ab4d168f34 100644
--- a/sys/netns/ns_ip.c
+++ b/sys/netns/ns_ip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_ip.c,v 1.9 2001/03/23 07:35:10 angelos Exp $	*/
+/*	$OpenBSD: ns_ip.c,v 1.10 2001/05/20 08:36:02 angelos Exp $	*/
 /*	$NetBSD: ns_ip.c,v 1.16 1996/05/09 22:29:40 scottr Exp $	*/
 
 /*
@@ -290,9 +290,9 @@ nsipoutput(ifp, m, dst, rt)
 		m0->m_next = m;
 		m0->m_len = sizeof (struct ip);
 		m0->m_pkthdr.len = m0->m_len + m->m_len;
-		m0->m_pkthdr.tdbi = m->m_pkthdr.tdbi;
+		m0->m_pkthdr.tags = m->m_pkthdr.tags;
 		m->m_flags &= ~M_PKTHDR;
-		m->m_pkthdr.tdbi = NULL;  /* paranoid */
+		m->m_pkthdr.tags = TAILQ_INITIALIZER(m->m_pkthdr.tags);
 	} else {
 		M_PREPEND(m, sizeof (struct ip), M_DONTWAIT);
 		if (m == 0)