patch-2.1.111 linux/net/ax25/ax25_std_in.c

• Lines: 26
• Date: Wed Jul 22 13:45:58 1998
• Orig file: v2.1.110/linux/net/ax25/ax25_std_in.c
• Orig date: Mon Jul 7 08:19:59 1997

diff -u --recursive --new-file v2.1.110/linux/net/ax25/ax25_std_in.c linux/net/ax25/ax25_std_in.c
@@ -335,11 +335,11 @@
 				ax25->condition |= AX25_COND_PEER_RX_BUSY;
 			if (type == AX25_RESPONSE && pf) {
 				ax25_stop_t1timer(ax25);
+				ax25->n2count = 0;
 				if (ax25_validate_nr(ax25, nr)) {
 					ax25_frames_acked(ax25, nr);
 					if (ax25->vs == ax25->va) {
 						ax25_start_t3timer(ax25);
-						ax25->n2count = 0;
 						ax25->state   = AX25_STATE_3;
 					} else {
 						ax25_requeue_frames(ax25);
@@ -364,11 +364,11 @@
 			ax25->condition &= ~AX25_COND_PEER_RX_BUSY;
 			if (pf && type == AX25_RESPONSE) {
 				ax25_stop_t1timer(ax25);
+				ax25->n2count = 0;
 				if (ax25_validate_nr(ax25, nr)) {
 					ax25_frames_acked(ax25, nr);
 					if (ax25->vs == ax25->va) {
 						ax25_start_t3timer(ax25);
-						ax25->n2count = 0;
 						ax25->state   = AX25_STATE_3;
 					} else {
 						ax25_requeue_frames(ax25);