backout the tree break. ok pb@, art@

3 files changed, 5 insertions, 13 deletions

diff --git a/sys/netccitt/if_x25subr.c b/sys/netccitt/if_x25subr.c
index ad7e23c6f9a..65b6be4838d 100644
--- a/sys/netccitt/if_x25subr.c
+++ b/sys/netccitt/if_x25subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_x25subr.c,v 1.11 2002/08/08 17:07:32 provos Exp $	*/
+/*	$OpenBSD: if_x25subr.c,v 1.12 2002/08/08 18:26:37 todd Exp $	*/
 /*	$NetBSD: if_x25subr.c,v 1.13 1996/05/09 22:29:25 scottr Exp $	*/
 
 /*
@@ -771,13 +771,7 @@ pk_rtattach(so, m0)
 	((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
 #define transfer_sockbuf(s, f, l) \
 	while ((m = (s)->sb_mb) != NULL) \
-		{ \
-			(s)->sb_mb = m->m_nextpkt; \
-			SB_EMPTY_FIXUP((s)); \
-			m->m_nextpkt = 0; \
-			sbfree((s), m); \
-			f; \
-		}
+		{(s)->sb_mb = m->m_act; m->m_act = 0; sbfree((s), m); f;}
 
 	if (rt)
 		rt->rt_refcnt--;
diff --git a/sys/netccitt/pk_output.c b/sys/netccitt/pk_output.c
index 36eed07cf5b..1329fe10c3c 100644
--- a/sys/netccitt/pk_output.c
+++ b/sys/netccitt/pk_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pk_output.c,v 1.3 2002/08/08 17:07:32 provos Exp $	*/
+/*	$OpenBSD: pk_output.c,v 1.4 2002/08/08 18:26:37 todd Exp $	*/
 /*	$NetBSD: pk_output.c,v 1.7 1996/02/13 22:05:30 christos Exp $	*/
 
 /*
@@ -212,8 +212,7 @@ nextpk(lcp)
 			return (NULL);
 
 		sb->sb_mb = m->m_nextpkt;
-		SB_EMPTY_FIXUP(sb);
-		m->m_nextpkt = 0;
+		m->m_act = 0;
 		for (n = m; n; n = n->m_next)
 			sbfree(sb, n);
 	}
diff --git a/sys/netccitt/pk_usrreq.c b/sys/netccitt/pk_usrreq.c
index f60c239a9cc..bf93ffa2116 100644
--- a/sys/netccitt/pk_usrreq.c
+++ b/sys/netccitt/pk_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pk_usrreq.c,v 1.5 2002/08/08 17:07:32 provos Exp $	*/
+/*	$OpenBSD: pk_usrreq.c,v 1.6 2002/08/08 18:26:37 todd Exp $	*/
 /*	$NetBSD: pk_usrreq.c,v 1.10 1996/02/13 22:05:43 christos Exp $	*/
 
 /*
@@ -277,7 +277,6 @@ pk_usrreq(so, req, m, nam, control)
 			if (n && n->m_type == MT_OOBDATA) {
 				unsigned        len = n->m_pkthdr.len;
 				so->so_rcv.sb_mb = n->m_nextpkt;
-				SB_EMPTY_FIXUP(&so->so_rcv);
 				if (len != n->m_len &&
 				    (n = m_pullup(n, len)) == 0)
 					break;