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

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

diff -u --recursive --new-file v1.3.74/linux/net/ax25/ax25_subr.c linux/net/ax25/ax25_subr.c
@@ -513,9 +513,7 @@
 
 void ax25_dama_on(ax25_cb *ax25)
 {
-	int count = ax25_dev_is_dama_slave(ax25->device);
-	
-	if (count == 0) {
+	if (ax25_dev_is_dama_slave(ax25->device) == 0) {
 		if (ax25->sk != NULL && ax25->sk->debug)
 			printk("ax25_dama_on: DAMA on\n");
 		ax25_kiss_cmd(ax25, 5, 1);
@@ -524,9 +522,11 @@
 
 void ax25_dama_off(ax25_cb *ax25)
 {
-	int count = ax25_dev_is_dama_slave(ax25->device);
-	
-	if (count == 0) {
+	if (ax25->dama_slave == 0)
+		return;
+
+	ax25->dama_slave = 0;
+	if (ax25_dev_is_dama_slave(ax25->device) == 0) {
 		if (ax25->sk != NULL && ax25->sk->debug)
 			printk("ax25_dama_off: DAMA off\n");
 		ax25_kiss_cmd(ax25, 5, 0);

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