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 ...

6 files changed, 22 insertions, 18 deletions

diff --git a/net/netrom/.cvsignore b/net/netrom/.cvsignore
index 4671378ae..857dd22e9 100644
--- a/net/netrom/.cvsignore
+++ b/net/netrom/.cvsignore
@@ -1 +1,2 @@
 .depend
+.*.flags
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 8b51f7120..a84d1fd53 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -300,7 +300,7 @@ void nr_destroy_socket(struct sock *sk)	/* Not static as it's used by the timer
 			skb->sk->protinfo.nr->state = NR_STATE_0;
 		}
 
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 	}
 
 	if (atomic_read(&sk->wmem_alloc) != 0 || atomic_read(&sk->rmem_alloc) != 0) {
@@ -763,7 +763,7 @@ static int nr_accept(struct socket *sock, struct socket *newsock, int flags)
 
 	/* Now attach up the new socket */
 	skb->sk = NULL;
-	kfree_skb(skb, FREE_READ);
+	kfree_skb(skb);
 	sk->ack_backlog--;
 	newsock->sk = newsk;
 
@@ -999,7 +999,7 @@ static int nr_sendmsg(struct socket *sock, struct msghdr *msg, int len, struct s
 	SOCK_DEBUG(sk, "NET/ROM: Transmitting buffer\n");
 
 	if (sk->state != TCP_ESTABLISHED) {
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		return -ENOTCONN;
 	}
 
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c
index 380ec8ecc..b04adbcaa 100644
--- a/net/netrom/nr_dev.c
+++ b/net/netrom/nr_dev.c
@@ -121,7 +121,10 @@ static int nr_rebuild_header(struct sk_buff *skb)
 	unsigned char *bp = skb->data;
 
 	if (arp_find(bp + 7, skb)) {
-		kfree_skb(skb, FREE_WRITE);
+#if 0
+		/* BUGGGG! If arp_find returned 1, skb does not exist. --ANK*/
+		kfree_skb(skb);
+#endif
 		return 1;
 	}
 
@@ -135,17 +138,17 @@ static int nr_rebuild_header(struct sk_buff *skb)
 	bp[6] |= AX25_SSSID_SPARE;
 
 	if ((skbn = skb_clone(skb, GFP_ATOMIC)) == NULL) {
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		return 1;
 	}
 
 	if (skb->sk != NULL)
 		skb_set_owner_w(skbn, skb->sk);
 
-	kfree_skb(skb, FREE_WRITE);
+	kfree_skb(skb);
 
 	if (!nr_route_frame(skbn, NULL)) {
-		kfree_skb(skbn, FREE_WRITE);
+		kfree_skb(skbn);
 		stats->tx_errors++;
 	}
 
@@ -216,7 +219,7 @@ static int nr_xmit(struct sk_buff *skb, struct device *dev)
 
 	sti();
 
-	kfree_skb(skb, FREE_WRITE);
+	kfree_skb(skb);
 
 	stats->tx_errors++;
 
diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c
index a0d3148c2..ac32cd704 100644
--- a/net/netrom/nr_in.c
+++ b/net/netrom/nr_in.c
@@ -74,7 +74,7 @@ static int nr_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)
 
 		while ((skbo = skb_dequeue(&sk->protinfo.nr->frag_queue)) != NULL) {
 			memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);
-			kfree_skb(skbo, FREE_READ);
+			kfree_skb(skbo);
 		}
 
 		sk->protinfo.nr->fraglen = 0;		
@@ -246,7 +246,7 @@ static int nr_state3_machine(struct sock *sk, struct sk_buff *skb, int frametype
 					} else if (nr_in_rx_window(sk, ns)) {
 						skb_queue_tail(&temp_queue, skbn);
 					} else {
-						kfree_skb(skbn, FREE_READ);
+						kfree_skb(skbn);
 					}
 				}
 				while ((skbn = skb_dequeue(&temp_queue)) != NULL) {
diff --git a/net/netrom/nr_out.c b/net/netrom/nr_out.c
index 4c3eb61d8..93da60adb 100644
--- a/net/netrom/nr_out.c
+++ b/net/netrom/nr_out.c
@@ -79,7 +79,7 @@ void nr_output(struct sock *sk, struct sk_buff *skb)
 			skb_queue_tail(&sk->write_queue, skbn); /* Throw it on the queue */
 		}
 
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 	} else {
 		skb_queue_tail(&sk->write_queue, skb);		/* Throw it on the queue */
 	}
@@ -216,7 +216,7 @@ void nr_transmit_buffer(struct sock *sk, struct sk_buff *skb)
 	*dptr++ = sysctl_netrom_network_ttl_initialiser;
 
 	if (!nr_route_frame(skb, NULL)) {
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		nr_disconnect(sk, ENETUNREACH);
 	}
 }
diff --git a/net/netrom/nr_subr.c b/net/netrom/nr_subr.c
index d31141876..7ae69fe07 100644
--- a/net/netrom/nr_subr.c
+++ b/net/netrom/nr_subr.c
@@ -47,16 +47,16 @@ void nr_clear_queues(struct sock *sk)
 	struct sk_buff *skb;
 
 	while ((skb = skb_dequeue(&sk->write_queue)) != NULL)
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 
 	while ((skb = skb_dequeue(&sk->protinfo.nr->ack_queue)) != NULL)
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 
 	while ((skb = skb_dequeue(&sk->protinfo.nr->reseq_queue)) != NULL)
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 
 	while ((skb = skb_dequeue(&sk->protinfo.nr->frag_queue)) != NULL)
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 }
 
 /*
@@ -74,7 +74,7 @@ void nr_frames_acked(struct sock *sk, unsigned short nr)
 	if (sk->protinfo.nr->va != nr) {
 		while (skb_peek(&sk->protinfo.nr->ack_queue) != NULL && sk->protinfo.nr->va != nr) {
 		        skb = skb_dequeue(&sk->protinfo.nr->ack_queue);
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			sk->protinfo.nr->va = (sk->protinfo.nr->va + 1) % NR_MODULUS;
 		}
 	}
@@ -266,7 +266,7 @@ void nr_transmit_dm(struct sk_buff *skb)
 	*dptr++ = 0;
 
 	if (!nr_route_frame(skbn, NULL))
-		kfree_skb(skbn, FREE_WRITE);
+		kfree_skb(skbn);
 }
 
 void nr_disconnect(struct sock *sk, int reason)