Look Ma' what I found on my harddisk ...

 o New faster syscalls for 2.1.x, too
 o Upgrade to 2.1.89.

Don't try to run this.  It's flaky as hell.  But feel free to debug ...

11 files changed, 30 insertions, 36 deletions

diff --git a/net/802/.cvsignore b/net/802/.cvsignore
index 4671378ae..857dd22e9 100644
--- a/net/802/.cvsignore
+++ b/net/802/.cvsignore
@@ -1 +1,2 @@
 .depend
+.*.flags
diff --git a/net/802/Makefile b/net/802/Makefile
index cea2410d8..12db50d50 100644
--- a/net/802/Makefile
+++ b/net/802/Makefile
@@ -17,7 +17,8 @@ endif
 ifeq ($(CONFIG_LLC),y)
 SUB_DIRS += transit
 O_OBJS += llc_sendpdu.o llc_utility.o cl2llc.o
-OX_OBJS += llc_macinit.o p8022.o psnap.o p8022tr.o
+OX_OBJS += llc_macinit.o
+SNAP = y
 endif
 
 ifdef CONFIG_TR
@@ -29,15 +30,18 @@ O_OBJS += fddi.o
 endif
 
 ifdef CONFIG_IPX
-OX_OBJS += p8022.o psnap.o p8022tr.o
+	SNAP=y
 endif
 
 ifdef CONFIG_ATALK
-ifndef CONFIG_IPX
-OX_OBJS += p8022.o psnap.o p8022tr.o
+	SNAP=y
 endif
+
+ifeq ($(SNAP),y)
+OX_OBJS += p8022.o psnap.o p8022tr.o
 endif
 
+
 include $(TOPDIR)/Rules.make
 
 cl2llc.c: cl2llc.pre
diff --git a/net/802/fddi.c b/net/802/fddi.c
index a282cc386..1c9f7e765 100644
--- a/net/802/fddi.c
+++ b/net/802/fddi.c
@@ -97,18 +97,6 @@ int fddi_header(struct sk_buff	*skb, struct device *dev, unsigned short type,
 int fddi_rebuild_header(struct sk_buff	*skb)
 {
 	struct fddihdr *fddi = (struct fddihdr *)skb->data;
-#if 0
- 	struct neighbour *neigh = NULL;
-
-	if (skb->dst)
-		neigh = skb->dst->neighbour;
-
-	if (neigh)
-		return neigh->ops->resolve(fddi->daddr, skb);
-#endif
-	/*
-	 * Only ARP/IP is currently supported
-	 */
 
 	if (fddi->hdr.llc_snap.ethertype != __constant_htons(ETH_P_IP))
 	{
diff --git a/net/802/llc_macinit.c b/net/802/llc_macinit.c
index 198230c36..a51a868f2 100644
--- a/net/802/llc_macinit.c
+++ b/net/802/llc_macinit.c
@@ -19,7 +19,6 @@
  *					Started restructuring handlers
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/kernel.h>
@@ -136,7 +135,7 @@ int llc_mac_data_indicate(llcptr lp, struct sk_buff *skb)
 		 *	No auto free for I pdus
 		 */
 		skb->sk = NULL;
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 	}
 
 	if(lp->llc_callbacks)
diff --git a/net/802/llc_sendpdu.c b/net/802/llc_sendpdu.c
index 5aeaecfbe..f0c6d116e 100644
--- a/net/802/llc_sendpdu.c
+++ b/net/802/llc_sendpdu.c
@@ -161,7 +161,6 @@ void llc_sendpdu(llcptr lp, char type, char pf, int data_len, char *pdu_data)
 		}
 		lp->dev->hard_header(skb, lp->dev, ETH_P_802_3,
 			 lp->remote_mac, NULL, fl);
-		skb->arp = 1;
 		skb->dev=lp->dev;
 		dev_queue_xmit(skb);
 	}
@@ -213,7 +212,6 @@ void llc_sendipdu(llcptr lp, char type, char pf, struct sk_buff *skb)
 		lp->vs = 0;
 	lp->dev->hard_header(skb, lp->dev, ETH_P_802_3,
 		lp->remote_mac, NULL, skb->len);
-	skb->arp = 1;
 	ADD_TO_RTQ(skb);		/* add skb to the retransmit queue */
 	tmp=skb_clone(skb, GFP_ATOMIC);
 	if(tmp!=NULL)
@@ -284,7 +282,6 @@ int llc_resend_ipdu(llcptr lp, unsigned char ack_nr, unsigned char type, char p)
 		tmp=skb_clone(skb, GFP_ATOMIC);
 		if(tmp!=NULL)
 		{
-			tmp->arp = 1;
 			tmp->dev = lp->dev;
 			dev_queue_xmit(skb);
 		}
@@ -347,7 +344,7 @@ int llc_free_acknowledged_skbs(llcptr lp, unsigned char pdu_ack)
 		fr = (frameptr) (pp->data + lp->dev->hard_header_len);
 		ns_save = fr->i_hdr.ns;
 
-		kfree_skb(pp, FREE_WRITE);
+		kfree_skb(pp);
 		ack_count++;
 
 		if (ns_save == ack) 
diff --git a/net/802/p8022.c b/net/802/p8022.c
index 1a12f4d60..b4a9b43f9 100644
--- a/net/802/p8022.c
+++ b/net/802/p8022.c
@@ -16,7 +16,6 @@
  *		4 entries at most). The current demux assumes this.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
@@ -62,7 +61,7 @@ int p8022_rcv(struct sk_buff *skb, struct device *dev, struct packet_type *pt)
 	}
 
 	skb->sk = NULL;
-	kfree_skb(skb, FREE_READ);
+	kfree_skb(skb);
 	return 0;
 }
 
diff --git a/net/802/p8022tr.c b/net/802/p8022tr.c
index ef6a4976a..b895c9343 100644
--- a/net/802/p8022tr.c
+++ b/net/802/p8022tr.c
@@ -8,7 +8,6 @@
  *		2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
@@ -57,7 +56,7 @@ int p8022tr_rcv(struct sk_buff *skb, struct device *dev, struct packet_type *pt)
 	}
 
 	skb->sk = NULL;
-	kfree_skb(skb, FREE_READ);
+	kfree_skb(skb);
 	return 0;
 }
 
diff --git a/net/802/psnap.c b/net/802/psnap.c
index 6ce58da35..24e7f2bd0 100644
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -10,7 +10,6 @@
  *		2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
@@ -67,7 +66,7 @@ int snap_rcv(struct sk_buff *skb, struct device *dev, struct packet_type *pt)
 		return proto->rcvfunc(skb, dev, &psnap_packet_type);
 	}
 	skb->sk = NULL;
-	kfree_skb(skb, FREE_READ);
+	kfree_skb(skb);
 	return 0;
 }
 
diff --git a/net/802/tr.c b/net/802/tr.c
index 07d0e0399..bf6cd83d7 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -50,7 +50,7 @@ struct rif_cache_s {
 	unsigned char addr[TR_ALEN];
 	unsigned char iface[5];
 	__u16 rcf;
-	__u8 rseg[8];
+	__u16 rseg[8];
 	rif_cache next;
 	unsigned long last_used;
 	unsigned char local_ring;
@@ -441,7 +441,7 @@ int rif_get_info(char *buffer,char **start, off_t offset, int length, int dummy)
 	int len=0;
 	off_t begin=0;
 	off_t pos=0;
-	int size,i,j,rcf_len;
+	int size,i,j,rcf_len,segment,brdgnmb;
 	unsigned long now=jiffies;
 
 	rif_cache entry;
@@ -466,10 +466,18 @@ int rif_get_info(char *buffer,char **start, off_t offset, int length, int dummy)
 				rcf_len = ((ntohs(entry->rcf) & TR_RCF_LEN_MASK)>>8)-2; 
 				if (rcf_len)
 				        rcf_len >>= 1;
-				for(j = 0; j < rcf_len; j++) {
-				        len+=size;
-				        pos=begin+len;
-			                size=sprintf(buffer+len," %04X",ntohs(entry->rseg[j]));
+				for(j = 1; j < rcf_len; j++) {
+					if(j==1) {
+						segment=ntohs(entry->rseg[j-1])>>4;
+						len+=size;
+						pos=begin+len;
+						size=sprintf(buffer+len,"  %03X",segment);
+					};
+					segment=ntohs(entry->rseg[j])>>4;
+					brdgnmb=ntohs(entry->rseg[j-1])&0x00f;
+					len+=size;
+					pos=begin+len;
+					size=sprintf(buffer+len,"-%01X-%03X",brdgnmb,segment);
 				}
 				len+=size;
 				pos=begin+len;
diff --git a/net/802/transit/pdutr.h b/net/802/transit/pdutr.h
index 55a65001d..900dc74b8 100644
--- a/net/802/transit/pdutr.h
+++ b/net/802/transit/pdutr.h
@@ -1,5 +1,5 @@
 
-/* this file was generated on Thu Dec  5 13:58:11 GMT 1996  */
+/* this file was generated on Thu Jan  8 00:21:19 GMT 1998  */
 
 /* index name #defines: */
 
diff --git a/net/802/transit/timertr.h b/net/802/transit/timertr.h
index 9b9403b5a..43237f180 100644
--- a/net/802/transit/timertr.h
+++ b/net/802/transit/timertr.h
@@ -1,5 +1,5 @@
 
-/* this file was generated on Mon Mar 10 22:45:36 GMT 1997  */
+/* this file was generated on Thu Jan  8 00:21:21 GMT 1998  */
 
 
 /* size of transition table is 898 bytes */