patch-2.1.71 linux/net/ax25/ax25_ds_subr.c

• Lines: 22
• Date: Wed Dec 3 15:16:39 1997
• Orig file: v2.1.70/linux/net/ax25/ax25_ds_subr.c
• Orig date: Mon Dec 1 12:04:15 1997

diff -u --recursive --new-file v2.1.70/linux/net/ax25/ax25_ds_subr.c linux/net/ax25/ax25_ds_subr.c
@@ -115,7 +115,10 @@
 		if (ax25o->state == AX25_STATE_1 || ax25o->state == AX25_STATE_2 || skb_peek(&ax25o->ack_queue) != NULL)
 			ax25_ds_t1_timeout(ax25o);
 
-		ax25_start_t3timer(ax25o);
+		/* do not start T3 for listening sockets (tnx DD8NE) */
+
+		if (ax25o->state != AX25_STATE_0)
+			ax25_start_t3timer(ax25o);
 	}
 }
 
@@ -210,8 +213,8 @@
 
 void ax25_dama_off(ax25_cb *ax25)
 {
-	ax25_dev_dama_off(ax25->ax25_dev);
 	ax25->condition &= ~AX25_COND_DAMA_MODE;
+	ax25_dev_dama_off(ax25->ax25_dev);
 }
 
 #endif