patch-2.3.47 linux/drivers/net/wavelan.c

• Lines: 28
• Date: Thu Feb 17 09:18:47 2000
• Orig file: v2.3.46/linux/drivers/net/wavelan.c
• Orig date: Sun Feb 13 19:29:04 2000

diff -u --recursive --new-file v2.3.46/linux/drivers/net/wavelan.c linux/drivers/net/wavelan.c
@@ -871,8 +871,7 @@
 	net_local *lp = (net_local *) dev->priv;
 
 	/* Check if we can do it now ! */
-	if (!test_bit(LINK_STATE_START, &dev->state) &&
-	    test_bit(LINK_STATE_XOFF, &dev->state)) {
+	if (!netif_running(dev) && netif_queue_stopped(dev)) {
 		lp->reconfig_82586 = 1;
 #ifdef DEBUG_CONFIG_INFO
 		printk(KERN_DEBUG
@@ -3713,7 +3712,7 @@
 
 	/* Check the state of the command unit. */
 	if (((status & SCB_ST_CNA) == SCB_ST_CNA) ||
-	    (((status & SCB_ST_CUS) != SCB_ST_CUS_ACTV) && test_bit(LINK_STATE_START, &dev->state))) {
+	    (((status & SCB_ST_CUS) != SCB_ST_CUS_ACTV) && netif_running(dev))) {
 #ifdef DEBUG_INTERRUPT_ERROR
 		printk(KERN_INFO
 		       "%s: wavelan_interrupt(): CU inactive -- restarting\n",
@@ -3724,7 +3723,7 @@
 
 	/* Check the state of the command unit. */
 	if (((status & SCB_ST_RNR) == SCB_ST_RNR) ||
-	    (((status & SCB_ST_RUS) != SCB_ST_RUS_RDY) && test_bit(LINK_STATE_START, &dev->state))) {
+	    (((status & SCB_ST_RUS) != SCB_ST_RUS_RDY) && netif_running(dev))) {
 #ifdef DEBUG_INTERRUPT_ERROR
 		printk(KERN_INFO
 		       "%s: wavelan_interrupt(): RU not ready -- restarting\n",