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

7 files changed, 27 insertions, 27 deletions

diff --git a/net/x25/.cvsignore b/net/x25/.cvsignore
index 4671378ae..857dd22e9 100644
--- a/net/x25/.cvsignore
+++ b/net/x25/.cvsignore
@@ -1 +1,2 @@
 .depend
+.*.flags
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index bc473e317..7e3c9cae2 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -323,7 +323,7 @@ void x25_destroy_socket(struct sock *sk)	/* Not static as it's used by the timer
 			skb->sk->protinfo.x25->state = X25_STATE_0;
 		}
 
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 	}
 
 	if (atomic_read(&sk->wmem_alloc) != 0 || atomic_read(&sk->rmem_alloc) != 0) {
@@ -714,11 +714,13 @@ static int x25_accept(struct socket *sock, struct socket *newsock, int flags)
 
 	newsk = skb->sk;
 	newsk->pair = NULL;
+	newsk->socket = newsock;
+	newsk->sleep = &newsock->wait;
 	sti();
 
 	/* Now attach up the new socket */
 	skb->sk = NULL;
-	kfree_skb(skb, FREE_READ);
+	kfree_skb(skb);
 	sk->ack_backlog--;
 	newsock->sk = newsk;
 
@@ -952,7 +954,7 @@ static int x25_sendmsg(struct socket *sock, struct msghdr *msg, int len, struct
 	SOCK_DEBUG(sk, "x25_sendmsg: Transmitting buffer\n");
 
 	if (sk->state != TCP_ESTABLISHED) {
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		return -ENOTCONN;
 	}
 
diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index c8ffb33ef..16fc3677d 100644
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -54,7 +54,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *neigh)
 	unsigned int lci;
 
 	if (call_in_firewall(PF_X25, skb->dev, skb->data, NULL, &skb) != FW_ACCEPT) {
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 		return 0;
 	}
 
@@ -90,7 +90,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *neigh)
 /*
 	x25_transmit_clear_request(neigh, lci, 0x0D);
 */
-	kfree_skb(skb, FREE_READ);
+	kfree_skb(skb);
 
 	return 0;
 }
@@ -106,7 +106,7 @@ int x25_lapb_receive_frame(struct sk_buff *skb, struct device *dev, struct packe
 	 */
 	if ((neigh = x25_get_neigh(dev)) == NULL) {
 		printk(KERN_DEBUG "X.25: unknown neighbour - %s\n", dev->name);
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 		return 0;
 	}
 
@@ -117,20 +117,20 @@ int x25_lapb_receive_frame(struct sk_buff *skb, struct device *dev, struct packe
 
 		case 0x01:
 			x25_link_established(neigh);
-			kfree_skb(skb, FREE_READ);
+			kfree_skb(skb);
 			return 0;
 
 		case 0x02:
 			x25_link_terminated(neigh);
-			kfree_skb(skb, FREE_READ);
+			kfree_skb(skb);
 			return 0;
 
 		case 0x03:
-			kfree_skb(skb, FREE_READ);
+			kfree_skb(skb);
 			return 0;
 
 		default:
-			kfree_skb(skb, FREE_READ);
+			kfree_skb(skb);
 			return 0;
 	}
 }
@@ -146,7 +146,7 @@ int x25_llc_receive_frame(struct sk_buff *skb, struct device *dev, struct packet
 	 */
 	if ((neigh = x25_get_neigh(dev)) == NULL) {
 		printk(KERN_DEBUG "X.25: unknown_neighbour - %s\n", dev->name);
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 		return 0;
 	}
 
@@ -178,7 +178,6 @@ void x25_establish_link(struct x25_neigh *neigh)
 
 	skb->protocol = htons(ETH_P_X25);
 	skb->dev      = neigh->dev;
-	skb->arp      = 1;
 
 	dev_queue_xmit(skb);
 }
@@ -208,7 +207,6 @@ void x25_terminate_link(struct x25_neigh *neigh)
 
 	skb->protocol = htons(ETH_P_X25);
 	skb->dev      = neigh->dev;
-	skb->arp      = 1;
 
 	dev_queue_xmit(skb);
 }
@@ -225,17 +223,16 @@ void x25_send_frame(struct sk_buff *skb, struct x25_neigh *neigh)
 
 #if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)
 		case ARPHRD_ETHER:
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			return;
 #endif
 		default:
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			return;
 	}
 
 	skb->protocol = htons(ETH_P_X25);
 	skb->dev      = neigh->dev;
-	skb->arp      = 1;
 
 	dev_queue_xmit(skb);
 }
diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c
index 1c4cb3bc7..b9a66103c 100644
--- a/net/x25/x25_in.c
+++ b/net/x25/x25_in.c
@@ -64,12 +64,12 @@ static int x25_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)
 
 		skbo = skb_dequeue(&sk->protinfo.x25->fragment_queue);
 		memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);
-		kfree_skb(skbo, FREE_READ);
+		kfree_skb(skbo);
 
 		while ((skbo = skb_dequeue(&sk->protinfo.x25->fragment_queue)) != NULL) {
 			skb_pull(skbo, (sk->protinfo.x25->neighbour->extended) ? X25_EXT_MIN_LEN : X25_STD_MIN_LEN);
 			memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);
-			kfree_skb(skbo, FREE_READ);
+			kfree_skb(skbo);
 		}
 
 		sk->protinfo.x25->fraglen = 0;		
diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c
index 1742d802f..f27fa4f4a 100644
--- a/net/x25/x25_link.c
+++ b/net/x25/x25_link.c
@@ -225,7 +225,7 @@ void x25_transmit_clear_request(struct x25_neigh *neigh, unsigned int lci, unsig
 void x25_transmit_link(struct sk_buff *skb, struct x25_neigh *neigh)
 {
 	if (call_fw_firewall(PF_X25, skb->dev, skb->data, NULL, &skb) != FW_ACCEPT) {
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		return;
 	}
 
@@ -304,7 +304,7 @@ static void x25_remove_neigh(struct x25_neigh *x25_neigh)
 	struct sk_buff *skb;
 
 	while ((skb = skb_dequeue(&x25_neigh->queue)) != NULL)
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 
 	x25_stop_t20timer(x25_neigh);
 
diff --git a/net/x25/x25_out.c b/net/x25/x25_out.c
index 5283092a1..24fdf4d47 100644
--- a/net/x25/x25_out.c
+++ b/net/x25/x25_out.c
@@ -98,7 +98,7 @@ void x25_output(struct sock *sk, struct sk_buff *skb)
 			skb_queue_tail(&sk->write_queue, skbn);
 		}
 		
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 	} else {
 		skb_queue_tail(&sk->write_queue, skb);
 	}
diff --git a/net/x25/x25_subr.c b/net/x25/x25_subr.c
index 52e5be0cb..8b055e40e 100644
--- a/net/x25/x25_subr.c
+++ b/net/x25/x25_subr.c
@@ -48,19 +48,19 @@ void x25_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.x25->ack_queue)) != NULL)
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 
 	while ((skb = skb_dequeue(&sk->protinfo.x25->interrupt_in_queue)) != NULL)
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 
 	while ((skb = skb_dequeue(&sk->protinfo.x25->interrupt_out_queue)) != NULL)
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 
 	while ((skb = skb_dequeue(&sk->protinfo.x25->fragment_queue)) != NULL)
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 }
 
 
@@ -82,7 +82,7 @@ void x25_frames_acked(struct sock *sk, unsigned short nr)
 	if (sk->protinfo.x25->va != nr) {
 		while (skb_peek(&sk->protinfo.x25->ack_queue) != NULL && sk->protinfo.x25->va != nr) {
 			skb = skb_dequeue(&sk->protinfo.x25->ack_queue);
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			sk->protinfo.x25->va = (sk->protinfo.x25->va + 1) % modulus;
 		}
 	}