patch-2.3.47 linux/drivers/net/wan/cycx_x25.c

Next file: linux/drivers/net/wan/dlci.c
Previous file: linux/drivers/net/via-rhine.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.46/linux/drivers/net/wan/cycx_x25.c linux/drivers/net/wan/cycx_x25.c
@@ -505,7 +505,7 @@
 	x25_channel_t *chan = dev->priv;
 	cycx_t *card = chan->card;
 
-	if (test_bit(LINK_STATE_START, &dev->state))
+	if (netif_running(dev))
 		return -EBUSY; /* only one open is allowed */ 
 
 	netif_start_queue(dev);
@@ -1564,7 +1564,7 @@
 		x25_channel_t *chan = dev->priv;
 
 		printk(KERN_INFO "%-5.5s %-15.15s   %d     ETH_P_%s\n",
-				 chan->name, chan->addr, test_bit(LINK_STATE_XOFF, &dev->state),
+				 chan->name, chan->addr, netif_queue_stopped(dev),
 				 chan->protocol == ETH_P_IP ? "IP" : "X25");
 		dev = chan->slave;
 	}

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