patch-1.3.75 linux/net/ax25/ax25_in.c

Next file: linux/net/ax25/ax25_route.c
Previous file: linux/net/ax25/af_ax25.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.74/linux/net/ax25/ax25_in.c linux/net/ax25/ax25_in.c
@@ -303,7 +303,6 @@
 			ax25_send_control(ax25, UA, pf, C_RESPONSE);
 			if (ax25->dama_slave) {
 				ax25->state = AX25_STATE_0;
-				ax25->dama_slave = 0;
 				ax25_dama_off(ax25);
 
 				if (ax25->sk != NULL) {
@@ -319,7 +318,6 @@
 		case UA:
 			if (pf) {
 				ax25->state = AX25_STATE_0;
-				ax25->dama_slave = 0;
 				ax25_dama_off(ax25);
 
 				if (ax25->sk != NULL) {
@@ -335,7 +333,6 @@
 		case DM:
 			if (pf) {
 				ax25->state = AX25_STATE_0;
-				ax25->dama_slave = 0;
 				ax25_dama_off(ax25);
 					
 				if (ax25->sk != NULL) {
@@ -414,7 +411,6 @@
 			ax25_send_control(ax25, UA, pf, C_RESPONSE);
 			ax25->t3timer = 0;
 			ax25->state   = AX25_STATE_0;
-			ax25->dama_slave = 0;
 			ax25_dama_off(ax25);
 			
 			if (ax25->sk != NULL) {
@@ -430,7 +426,6 @@
 			ax25_clear_queues(ax25);
 			ax25->t3timer = 0;
 			ax25->state   = AX25_STATE_0;
-			ax25->dama_slave = 0;
 			ax25_dama_off(ax25);
 			if (ax25->sk) {
 				ax25->sk->state = TCP_CLOSE;
@@ -612,7 +607,6 @@
 			ax25_send_control(ax25, UA, pf, C_RESPONSE);
 			ax25->t3timer = 0;
 			ax25->state   = AX25_STATE_0;
-			ax25->dama_slave = 0;
 			ax25_dama_off(ax25);
 			
 			if (ax25->sk != NULL) {
@@ -628,7 +622,6 @@
 			ax25_clear_queues(ax25);
 			ax25->t3timer = 0;
 			ax25->state   = AX25_STATE_0;
-			ax25->dama_slave = 0;
 			ax25_dama_off(ax25);
 			
 			if (ax25->sk != NULL) {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this