patch-2.1.68 linux/net/x25/x25_out.c

• Lines: 74
• Date: Sun Nov 30 14:00:40 1997
• Orig file: v2.1.67/linux/net/x25/x25_out.c
• Orig date: Mon Jul 7 08:20:00 1997

diff -u --recursive --new-file v2.1.67/linux/net/x25/x25_out.c linux/net/x25/x25_out.c
@@ -126,8 +126,8 @@
 
 void x25_kick(struct sock *sk)
 {
-	struct sk_buff *skb;
-	unsigned short end;
+	struct sk_buff *skb, *skbn;
+	unsigned short start, end;
 	int modulus;
 
 	if (sk->protinfo.x25->state != X25_STATE_3)
@@ -149,11 +149,15 @@
 		return;
 
 	modulus = (sk->protinfo.x25->neighbour->extended) ? X25_EMODULUS : X25_SMODULUS;
+
+	start   = (skb_peek(&sk->protinfo.x25->ack_queue) == NULL) ? sk->protinfo.x25->va : sk->protinfo.x25->vs;
 	end     = (sk->protinfo.x25->va + sk->protinfo.x25->facilities.winsize_out) % modulus;
 
-	if (sk->protinfo.x25->vs == end)
+	if (start == end)
 		return;
 
+	sk->protinfo.x25->vs = start;
+
 	/*
 	 * Transmit data until either we're out of data to send or
 	 * the window is full.
@@ -162,13 +166,25 @@
 	skb = skb_dequeue(&sk->write_queue);
 
 	do {
+		if ((skbn = skb_clone(skb, GFP_ATOMIC)) == NULL) {
+			skb_queue_head(&sk->write_queue, skb);
+			break;
+		}
+
+		skb_set_owner_w(skbn, sk);
+
 		/*
-		 * Transmit the frame.
+		 * Transmit the frame copy.
 		 */
-		x25_send_iframe(sk, skb);
+		x25_send_iframe(sk, skbn);
 
 		sk->protinfo.x25->vs = (sk->protinfo.x25->vs + 1) % modulus;
 
+		/*
+		 * Requeue the original data frame.
+		 */
+		skb_queue_tail(&sk->protinfo.x25->ack_queue, skb);
+
 	} while (sk->protinfo.x25->vs != end && (skb = skb_dequeue(&sk->write_queue)) != NULL);
 
 	sk->protinfo.x25->vl         = sk->protinfo.x25->vr;
@@ -193,17 +209,6 @@
 	sk->protinfo.x25->condition &= ~X25_COND_ACK_PENDING;
 
 	x25_stop_timer(sk);
-}
-
-void x25_check_iframes_acked(struct sock *sk, unsigned short nr)
-{
-	if (sk->protinfo.x25->vs == nr) {
-		sk->protinfo.x25->va = nr;
-	} else {
-		if (sk->protinfo.x25->va != nr) {
-			sk->protinfo.x25->va = nr;
-		}
-	}
 }
 
 #endif