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

• Lines: 34
• Date: Thu Feb 17 09:18:47 2000
• Orig file: v2.3.46/linux/drivers/net/pcmcia/ray_cs.c
• Orig date: Thu Feb 10 17:11:11 2000

diff -u --recursive --new-file v2.3.46/linux/drivers/net/pcmcia/ray_cs.c linux/drivers/net/pcmcia/ray_cs.c
@@ -926,8 +926,7 @@
     switch (event) {
     case CS_EVENT_CARD_REMOVAL:
         link->state &= ~DEV_PRESENT;
-        netif_stop_queue(dev);
-        clear_bit(LINK_STATE_START, &dev->state);
+        netif_device_detach(dev);
         if (link->state & DEV_CONFIG) {
             link->release.expires = jiffies + HZ/20;
             add_timer(&link->release);
@@ -943,10 +942,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);
+
             pcmcia_release_configuration(link->handle);
         }
         break;
@@ -958,8 +956,7 @@
             pcmcia_request_configuration(link->handle, &link->conf);
             if (link->open) {
                 ray_reset(dev);
-		netif_start_queue(dev);
-		set_bit(LINK_STATE_START, &dev->state);
+		netif_device_attach(dev);
             }
         }
         break;