From: Russell King This is a rather old patch which re-orders the teardown of PCMCIA network devices. Current device drivers remove the IO mappings, interrupts, and free any PCMCIA windows before they unregister themselves from the network layer. This patch ensures that we first unregister from the network layer before performing any teardown of resources or windows. Note: the only card which has been tested in this patch is pcnet_cs. Signed-off-by: Andrew Morton --- 25-akpm/drivers/net/pcmcia/3c574_cs.c | 11 ++++------ 25-akpm/drivers/net/pcmcia/3c589_cs.c | 9 +++----- 25-akpm/drivers/net/pcmcia/axnet_cs.c | 9 +++----- 25-akpm/drivers/net/pcmcia/com20020_cs.c | 32 +++++++++++++------------------ 25-akpm/drivers/net/pcmcia/fmvj18x_cs.c | 9 +++----- 25-akpm/drivers/net/pcmcia/ibmtr_cs.c | 1 25-akpm/drivers/net/pcmcia/nmclan_cs.c | 9 +++----- 25-akpm/drivers/net/pcmcia/pcnet_cs.c | 9 +++----- 25-akpm/drivers/net/pcmcia/smc91c92_cs.c | 9 +++----- 25-akpm/drivers/net/pcmcia/xirc2ps_cs.c | 9 +++----- 10 files changed, 47 insertions(+), 60 deletions(-) diff -puN drivers/net/pcmcia/3c574_cs.c~pcmcia-net-device-unplugging-ordering-fix drivers/net/pcmcia/3c574_cs.c --- 25/drivers/net/pcmcia/3c574_cs.c~pcmcia-net-device-unplugging-ordering-fix 2004-06-29 02:41:14.476586384 -0700 +++ 25-akpm/drivers/net/pcmcia/3c574_cs.c 2004-06-29 02:41:14.500582736 -0700 @@ -360,7 +360,10 @@ static void tc574_detach(dev_link_t *lin for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next) if (*linkp == link) break; if (*linkp == NULL) - return; + return; + + if (link->dev) + unregister_netdev(dev); if (link->state & DEV_CONFIG) tc574_release(link); @@ -370,8 +373,6 @@ static void tc574_detach(dev_link_t *lin /* Unlink device structure, free bits */ *linkp = link->next; - if (link->dev) - unregister_netdev(dev); free_netdev(dev); } /* tc574_detach */ @@ -581,10 +582,8 @@ static int tc574_event(event_t event, in switch (event) { case CS_EVENT_CARD_REMOVAL: link->state &= ~DEV_PRESENT; - if (link->state & DEV_CONFIG) { + if (link->state & DEV_CONFIG) netif_device_detach(dev); - tc574_release(link); - } break; case CS_EVENT_CARD_INSERTION: link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; diff -puN drivers/net/pcmcia/3c589_cs.c~pcmcia-net-device-unplugging-ordering-fix drivers/net/pcmcia/3c589_cs.c --- 25/drivers/net/pcmcia/3c589_cs.c~pcmcia-net-device-unplugging-ordering-fix 2004-06-29 02:41:14.479585928 -0700 +++ 25-akpm/drivers/net/pcmcia/3c589_cs.c 2004-06-29 02:41:14.502582432 -0700 @@ -276,6 +276,9 @@ static void tc589_detach(dev_link_t *lin if (*linkp == NULL) return; + if (link->dev) + unregister_netdev(dev); + if (link->state & DEV_CONFIG) tc589_release(link); @@ -284,8 +287,6 @@ static void tc589_detach(dev_link_t *lin /* Unlink device structure, free bits */ *linkp = link->next; - if (link->dev) - unregister_netdev(dev); free_netdev(dev); } /* tc589_detach */ @@ -457,10 +458,8 @@ static int tc589_event(event_t event, in switch (event) { case CS_EVENT_CARD_REMOVAL: link->state &= ~DEV_PRESENT; - if (link->state & DEV_CONFIG) { + if (link->state & DEV_CONFIG) netif_device_detach(dev); - tc589_release(link); - } break; case CS_EVENT_CARD_INSERTION: link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; diff -puN drivers/net/pcmcia/axnet_cs.c~pcmcia-net-device-unplugging-ordering-fix drivers/net/pcmcia/axnet_cs.c --- 25/drivers/net/pcmcia/axnet_cs.c~pcmcia-net-device-unplugging-ordering-fix 2004-06-29 02:41:14.481585624 -0700 +++ 25-akpm/drivers/net/pcmcia/axnet_cs.c 2004-06-29 02:41:14.504582128 -0700 @@ -231,6 +231,9 @@ static void axnet_detach(dev_link_t *lin if (*linkp == NULL) return; + if (link->dev) + unregister_netdev(dev); + if (link->state & DEV_CONFIG) axnet_release(link); @@ -239,8 +242,6 @@ static void axnet_detach(dev_link_t *lin /* Unlink device structure, free bits */ *linkp = link->next; - if (link->dev) - unregister_netdev(dev); free_netdev(dev); } /* axnet_detach */ @@ -526,10 +527,8 @@ static int axnet_event(event_t event, in switch (event) { case CS_EVENT_CARD_REMOVAL: link->state &= ~DEV_PRESENT; - if (link->state & DEV_CONFIG) { + if (link->state & DEV_CONFIG) netif_device_detach(dev); - axnet_release(link); - } break; case CS_EVENT_CARD_INSERTION: link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; diff -puN drivers/net/pcmcia/com20020_cs.c~pcmcia-net-device-unplugging-ordering-fix drivers/net/pcmcia/com20020_cs.c --- 25/drivers/net/pcmcia/com20020_cs.c~pcmcia-net-device-unplugging-ordering-fix 2004-06-29 02:41:14.483585320 -0700 +++ 25-akpm/drivers/net/pcmcia/com20020_cs.c 2004-06-29 02:41:14.505581976 -0700 @@ -262,6 +262,19 @@ static void com20020_detach(dev_link_t * dev = info->dev; + if (link->dev) { + DEBUG(1,"unregister...\n"); + + unregister_netdev(dev); + + /* + * this is necessary because we register our IRQ separately + * from card services. + */ + if (dev->irq) + free_irq(dev->irq, dev); + } + if (link->state & DEV_CONFIG) com20020_release(link); @@ -276,21 +289,6 @@ static void com20020_detach(dev_link_t * dev = info->dev; if (dev) { - if (link->dev) - { - DEBUG(1,"unregister...\n"); - - unregister_netdev(dev); - - /* - * this is necessary because we register our IRQ separately - * from card services. - */ - if (dev->irq) - free_irq(dev->irq, dev); - /* ...but I/O ports are done automatically by card services */ - } - DEBUG(1,"kfree...\n"); free_netdev(dev); } @@ -462,10 +460,8 @@ static int com20020_event(event_t event, switch (event) { case CS_EVENT_CARD_REMOVAL: link->state &= ~DEV_PRESENT; - if (link->state & DEV_CONFIG) { + if (link->state & DEV_CONFIG) netif_device_detach(dev); - link->state |= DEV_RELEASE_PENDING; - } break; case CS_EVENT_CARD_INSERTION: link->state |= DEV_PRESENT; diff -puN drivers/net/pcmcia/fmvj18x_cs.c~pcmcia-net-device-unplugging-ordering-fix drivers/net/pcmcia/fmvj18x_cs.c --- 25/drivers/net/pcmcia/fmvj18x_cs.c~pcmcia-net-device-unplugging-ordering-fix 2004-06-29 02:41:14.485585016 -0700 +++ 25-akpm/drivers/net/pcmcia/fmvj18x_cs.c 2004-06-29 02:41:14.507581672 -0700 @@ -332,6 +332,9 @@ static void fmvj18x_detach(dev_link_t *l if (*linkp == NULL) return; + if (link->dev) + unregister_netdev(dev); + if (link->state & DEV_CONFIG) fmvj18x_release(link); @@ -341,8 +344,6 @@ static void fmvj18x_detach(dev_link_t *l /* Unlink device structure, free pieces */ *linkp = link->next; - if (link->dev) - unregister_netdev(dev); free_netdev(dev); } /* fmvj18x_detach */ @@ -742,10 +743,8 @@ static int fmvj18x_event(event_t event, switch (event) { case CS_EVENT_CARD_REMOVAL: link->state &= ~DEV_PRESENT; - if (link->state & DEV_CONFIG) { + if (link->state & DEV_CONFIG) netif_device_detach(dev); - fmvj18x_release(link); - } break; case CS_EVENT_CARD_INSERTION: link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; diff -puN drivers/net/pcmcia/ibmtr_cs.c~pcmcia-net-device-unplugging-ordering-fix drivers/net/pcmcia/ibmtr_cs.c --- 25/drivers/net/pcmcia/ibmtr_cs.c~pcmcia-net-device-unplugging-ordering-fix 2004-06-29 02:41:14.486584864 -0700 +++ 25-akpm/drivers/net/pcmcia/ibmtr_cs.c 2004-06-29 02:41:14.509581368 -0700 @@ -447,7 +447,6 @@ static int ibmtr_event(event_t event, in struct tok_info *priv = netdev_priv(dev); priv->sram_virt |= 1; netif_device_detach(dev); - ibmtr_release(link); } break; case CS_EVENT_CARD_INSERTION: diff -puN drivers/net/pcmcia/nmclan_cs.c~pcmcia-net-device-unplugging-ordering-fix drivers/net/pcmcia/nmclan_cs.c --- 25/drivers/net/pcmcia/nmclan_cs.c~pcmcia-net-device-unplugging-ordering-fix 2004-06-29 02:41:14.488584560 -0700 +++ 25-akpm/drivers/net/pcmcia/nmclan_cs.c 2004-06-29 02:41:14.511581064 -0700 @@ -551,6 +551,9 @@ static void nmclan_detach(dev_link_t *li if (*linkp == NULL) return; + if (link->dev) + unregister_netdev(dev); + if (link->state & DEV_CONFIG) nmclan_release(link); @@ -559,8 +562,6 @@ static void nmclan_detach(dev_link_t *li /* Unlink device structure, free bits */ *linkp = link->next; - if (link->dev) - unregister_netdev(dev); free_netdev(dev); } /* nmclan_detach */ @@ -835,10 +836,8 @@ static int nmclan_event(event_t event, i switch (event) { case CS_EVENT_CARD_REMOVAL: link->state &= ~DEV_PRESENT; - if (link->state & DEV_CONFIG) { + if (link->state & DEV_CONFIG) netif_device_detach(dev); - nmclan_release(link); - } break; case CS_EVENT_CARD_INSERTION: link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; diff -puN drivers/net/pcmcia/pcnet_cs.c~pcmcia-net-device-unplugging-ordering-fix drivers/net/pcmcia/pcnet_cs.c --- 25/drivers/net/pcmcia/pcnet_cs.c~pcmcia-net-device-unplugging-ordering-fix 2004-06-29 02:41:14.490584256 -0700 +++ 25-akpm/drivers/net/pcmcia/pcnet_cs.c 2004-06-29 02:41:14.513580760 -0700 @@ -326,6 +326,9 @@ static void pcnet_detach(dev_link_t *lin if (*linkp == NULL) return; + if (link->dev) + unregister_netdev(dev); + if (link->state & DEV_CONFIG) pcnet_release(link); @@ -334,8 +337,6 @@ static void pcnet_detach(dev_link_t *lin /* Unlink device structure, free bits */ *linkp = link->next; - if (link->dev) - unregister_netdev(dev); free_netdev(dev); } /* pcnet_detach */ @@ -807,10 +808,8 @@ static int pcnet_event(event_t event, in switch (event) { case CS_EVENT_CARD_REMOVAL: link->state &= ~DEV_PRESENT; - if (link->state & DEV_CONFIG) { + if (link->state & DEV_CONFIG) netif_device_detach(dev); - pcnet_release(link); - } break; case CS_EVENT_CARD_INSERTION: link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; diff -puN drivers/net/pcmcia/smc91c92_cs.c~pcmcia-net-device-unplugging-ordering-fix drivers/net/pcmcia/smc91c92_cs.c --- 25/drivers/net/pcmcia/smc91c92_cs.c~pcmcia-net-device-unplugging-ordering-fix 2004-06-29 02:41:14.493583800 -0700 +++ 25-akpm/drivers/net/pcmcia/smc91c92_cs.c 2004-06-29 02:41:14.516580304 -0700 @@ -411,6 +411,9 @@ static void smc91c92_detach(dev_link_t * if (*linkp == NULL) return; + if (link->dev) + unregister_netdev(dev); + if (link->state & DEV_CONFIG) smc91c92_release(link); @@ -419,8 +422,6 @@ static void smc91c92_detach(dev_link_t * /* Unlink device structure, free bits */ *linkp = link->next; - if (link->dev) - unregister_netdev(dev); free_netdev(dev); } /* smc91c92_detach */ @@ -1113,10 +1114,8 @@ static int smc91c92_event(event_t event, switch (event) { case CS_EVENT_CARD_REMOVAL: link->state &= ~DEV_PRESENT; - if (link->state & DEV_CONFIG) { + if (link->state & DEV_CONFIG) netif_device_detach(dev); - smc91c92_release(link); - } break; case CS_EVENT_CARD_INSERTION: link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; diff -puN drivers/net/pcmcia/xirc2ps_cs.c~pcmcia-net-device-unplugging-ordering-fix drivers/net/pcmcia/xirc2ps_cs.c --- 25/drivers/net/pcmcia/xirc2ps_cs.c~pcmcia-net-device-unplugging-ordering-fix 2004-06-29 02:41:14.495583496 -0700 +++ 25-akpm/drivers/net/pcmcia/xirc2ps_cs.c 2004-06-29 02:41:14.518580000 -0700 @@ -668,6 +668,9 @@ xirc2ps_detach(dev_link_t * link) return; } + if (link->dev) + unregister_netdev(dev); + /* * If the device is currently configured and active, we won't * actually delete it yet. Instead, it is marked so that when @@ -683,8 +686,6 @@ xirc2ps_detach(dev_link_t * link) /* Unlink device structure, free it */ *linkp = link->next; - if (link->dev) - unregister_netdev(dev); free_netdev(dev); } /* xirc2ps_detach */ @@ -1204,10 +1205,8 @@ xirc2ps_event(event_t event, int priorit break; case CS_EVENT_CARD_REMOVAL: link->state &= ~DEV_PRESENT; - if (link->state & DEV_CONFIG) { + if (link->state & DEV_CONFIG) netif_device_detach(dev); - xirc2ps_release(link); - } break; case CS_EVENT_CARD_INSERTION: link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; _