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

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

diff -u --recursive --new-file v2.3.46/linux/drivers/net/pcmcia/nmclan_cs.c linux/drivers/net/pcmcia/nmclan_cs.c
@@ -870,7 +870,7 @@
     case CS_EVENT_CARD_REMOVAL:
       link->state &= ~DEV_PRESENT;
       if (link->state & DEV_CONFIG) {
-	netif_stop_queue (dev);
+	netif_device_detach(dev);
 	link->release.expires = jiffies + HZ/20;
 	add_timer(&link->release);
       }
@@ -884,9 +884,9 @@
       /* Fall through... */
     case CS_EVENT_RESET_PHYSICAL:
       if (link->state & DEV_CONFIG) {
-	if (link->open) {
-	  netif_stop_queue (dev);
-	}
+	if (link->open)
+	  netif_device_detach(dev);
+
 	CardServices(ReleaseConfiguration, link->handle);
       }
       break;
@@ -898,7 +898,7 @@
 	CardServices(RequestConfiguration, link->handle, &link->conf);
 	if (link->open) {
 	  nmclan_reset(dev);
-	  netif_start_queue (dev);
+	  netif_device_attach(dev);
 	}
       }
       break;
@@ -1153,7 +1153,7 @@
     return;
   }
 
-  if (!test_bit(LINK_STATE_START, &dev->state)) {
+  if (!netif_device_present(dev)) {
     DEBUG(2, "%s: interrupt from dead card\n", dev->name);
     goto exception;
   }