patch-1.3.14 linux/net/netrom/nr_timer.c

• Lines: 46
• Date: Mon Jul 31 09:46:27 1995
• Orig file: v1.3.13/linux/net/netrom/nr_timer.c
• Orig date: Fri Jun 30 16:22:34 1995

diff -u --recursive --new-file v1.3.13/linux/net/netrom/nr_timer.c linux/net/netrom/nr_timer.c
@@ -58,7 +58,7 @@
 	sk->timer.data     = (unsigned long)sk;
 	sk->timer.function = &nr_timer;
 
-	sk->timer.expires = 10;
+	sk->timer.expires = jiffies+10;
 	add_timer(&sk->timer);
 }
 
@@ -73,7 +73,7 @@
 
 	sk->timer.data     = (unsigned long)sk;
 	sk->timer.function = &nr_timer;
-	sk->timer.expires  = 10;
+	sk->timer.expires  = jiffies+10;
 	add_timer(&sk->timer);
 }
 
@@ -140,7 +140,7 @@
 	switch (sk->nr->state) {
 		case NR_STATE_1: 
 			if (sk->nr->n2count == sk->nr->n2) {
-				nr_clear_tx_queue(sk);
+				nr_clear_queues(sk);
 				sk->nr->state = NR_STATE_0;
 				sk->state     = TCP_CLOSE;
 				sk->err       = ETIMEDOUT;
@@ -155,7 +155,7 @@
 
 		case NR_STATE_2:
 			if (sk->nr->n2count == sk->nr->n2) {
-				nr_clear_tx_queue(sk);
+				nr_clear_queues(sk);
 				sk->nr->state = NR_STATE_0;
 				sk->state     = TCP_CLOSE;
 				sk->err       = ETIMEDOUT;
@@ -170,7 +170,7 @@
 
 		case NR_STATE_3:
 			if (sk->nr->n2count == sk->nr->n2) {
-				nr_clear_tx_queue(sk);
+				nr_clear_queues(sk);
 				sk->nr->state = NR_STATE_0;
 				sk->state     = TCP_CLOSE;
 				sk->err       = ETIMEDOUT;