patch-2.3.49 linux/drivers/net/pcmcia/com20020_cs.c

Next file: linux/drivers/net/rrunner.c
Previous file: linux/drivers/net/pcmcia/aironet4500_cs.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.48/linux/drivers/net/pcmcia/com20020_cs.c linux/drivers/net/pcmcia/com20020_cs.c
@@ -309,7 +309,7 @@
 	    {
 		DEBUG(1,"unregister...\n");
 
-		if (dev->start)
+		if (netif_running(dev))
 		    dev->stop(dev);
 	    
 		/*
@@ -501,7 +501,7 @@
     case CS_EVENT_CARD_REMOVAL:
         link->state &= ~DEV_PRESENT;
         if (link->state & DEV_CONFIG) {
-            dev->tbusy = 1; dev->start = 0;
+            netif_device_detach(dev);
             link->release.expires = jiffies + HZ/20;
             link->state |= DEV_RELEASE_PENDING;
             add_timer(&link->release);
@@ -517,7 +517,7 @@
     case CS_EVENT_RESET_PHYSICAL:
         if (link->state & DEV_CONFIG) {
             if (link->open) {
-                dev->tbusy = 1; dev->start = 0;
+                netif_device_detach(dev);
             }
             CardServices(ReleaseConfiguration, link->handle);
         }

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