patch-2.3.47 linux/drivers/net/hamradio/6pack.c

Next file: linux/drivers/net/hamradio/baycom_epp.c
Previous file: linux/drivers/net/epic100.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.46/linux/drivers/net/hamradio/6pack.c linux/drivers/net/hamradio/6pack.c
@@ -283,7 +283,8 @@
 	struct sixpack *sp = (struct sixpack *) tty->disc_data;
 
 	/* First make sure we're connected. */
-	if (!sp || sp->magic != SIXPACK_MAGIC || !test_bit(LINK_STATE_START, &sp->dev->state)) {
+	if (!sp || sp->magic != SIXPACK_MAGIC ||
+	    !netif_running(sp->dev)) {
 		return;
 	}
 
@@ -477,7 +478,8 @@
 
 	struct sixpack *sp = (struct sixpack *) tty->disc_data;
 
-	if (!sp || sp->magic != SIXPACK_MAGIC || !test_bit(LINK_STATE_START, &sp->dev->state) || !count)
+	if (!sp || sp->magic != SIXPACK_MAGIC ||
+	    !netif_running(sp->dev) || !count)
 		return;
 
 	save_flags(flags);
@@ -750,7 +752,7 @@
 				 * VSV = if dev->start==0, then device
 				 * unregistered while close proc.
 				 */ 
-				if (test_bit(LINK_STATE_START, &sixpack_ctrls[i]->dev.state))
+				if (netif_running(sixpack_ctrls[i]->dev))
 					unregister_netdev(&(sixpack_ctrls[i]->dev));
 
 				kfree(sixpack_ctrls[i]);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)