patch-2.3.47 linux/drivers/net/pcmcia/netwave_cs.c

• Lines: 43
• Date: Thu Feb 17 09:18:47 2000
• Orig file: v2.3.46/linux/drivers/net/pcmcia/netwave_cs.c
• Orig date: Wed Feb 16 17:03:52 2000

diff -u --recursive --new-file v2.3.46/linux/drivers/net/pcmcia/netwave_cs.c linux/drivers/net/pcmcia/netwave_cs.c
@@ -1019,8 +1019,7 @@
     case CS_EVENT_CARD_REMOVAL:
 	link->state &= ~DEV_PRESENT;
 	if (link->state & DEV_CONFIG) {
-	    netif_stop_queue (dev);
-	    clear_bit(LINK_STATE_START, &dev->state);
+	    netif_device_detach(dev);
 	    link->release.expires = jiffies + 5;
 	    add_timer(&link->release);
 	}
@@ -1034,10 +1033,9 @@
 	/* Fall through... */
     case CS_EVENT_RESET_PHYSICAL:
 	if (link->state & DEV_CONFIG) {
-	    if (link->open) {
-		netif_stop_queue (dev);
-		clear_bit(LINK_STATE_START, &dev->state);
-	    }
+	    if (link->open)
+		netif_device_detach(dev);
+
 	    CardServices(ReleaseConfiguration, link->handle);
 	}
 	break;
@@ -1049,8 +1047,7 @@
 	    CardServices(RequestConfiguration, link->handle, &link->conf);
 	    if (link->open) {
 		netwave_reset(dev);
-		set_bit(LINK_STATE_START, &dev->state);
-		netif_start_queue (dev);
+		netif_device_attach(dev);
 	    }
 	}
 	break;
@@ -1299,7 +1296,7 @@
     dev_link_t *link = &priv->link;
     int i;
     
-    if ((dev == NULL) || !test_bit(LINK_STATE_START, &dev->state))
+    if ((dev == NULL) || !netif_device_present(dev))
 	return;
     
     spin_lock (&priv->lock);