patch-2.1.17 linux/net/rose/rose_out.c

Next file: linux/net/rose/rose_route.c
Previous file: linux/net/rose/af_rose.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.16/linux/net/rose/rose_out.c linux/net/rose/rose_out.c
@@ -155,7 +155,9 @@
 
 		} while (!last && (skb = skb_dequeue(&sk->write_queue)) != NULL);
 
-		sk->protinfo.rose->vl = sk->protinfo.rose->vr;
+		sk->protinfo.rose->vl         = sk->protinfo.rose->vr;
+		sk->protinfo.rose->condition &= ~ACK_PENDING_CONDITION;
+		sk->protinfo.rose->timer      = 0;
 	}
 
 	rose_set_timer(sk);
@@ -174,7 +176,9 @@
 		rose_write_internal(sk, ROSE_RR);
 	}
 
-	sk->protinfo.rose->vl = sk->protinfo.rose->vr;
+	sk->protinfo.rose->vl         = sk->protinfo.rose->vr;
+	sk->protinfo.rose->condition &= ~ACK_PENDING_CONDITION;
+	sk->protinfo.rose->timer      = 0;
 }
 
 void rose_check_iframes_acked(struct sock *sk, unsigned short nr)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov