Unregister network device before releasing PCMCIA resources
Subsystems (3)
PATCH 1/1 Unregister network device before releasing PCMCIA resources
From: Pavel Roskin <[email protected]>
This is the right thing to do and it prevents kernel BUG on unload.
Some PCMCIA network drivers use link->dev_node as a flag indicating that the network device has been successfully registered. Recent code changes cause this flag to be 0 after PCMCIA resources have been released.
Signed-off-by Pavel Roskin <[email protected]>
---
drivers/net/wireless/netwave_cs.c | 4 ++-- drivers/net/wireless/orinoco_cs.c | 5 +++-- drivers/net/wireless/ray_cs.c | 4 +++- drivers/net/wireless/spectrum_cs.c | 5 +++-- drivers/net/wireless/wavelan_cs.c | 9 +++++---- 5 files changed, 16 insertions(+), 11 deletions(-)
drivers/net/wireless/netwave_cs.c +2 -2
@@ -445,11 +445,11 @@ static void netwave_detach(struct pcmciaDEBUG (0 ,"netwave_detach(0x%p)\n" , link); -netwave_release (link); -if (link->dev_node)unregister_netdev (dev); +netwave_release (link); +free_netdev (dev); }/* netwave_detach */
drivers/net/wireless/orinoco_cs.c +3 -2
@@ -147,14 +147,15 @@ static void orinoco_cs_detach(struct pcm {struct net_device *dev = link->priv; -orinoco_cs_release (link); -DEBUG (0 ,PFX "detach: link=%p link->dev_node=%p\n" , link, link->dev_node);if (link->dev_node) {DEBUG (0 ,PFX "About to unregister net device %p\n" , dev);unregister_netdev (dev); } + +orinoco_cs_release (link); +free_orinocodev (dev); }/* orinoco_cs_detach */
drivers/net/wireless/ray_cs.c +3 -1
@@ -388,13 +388,15 @@ static void ray_detach(struct pcmcia_dev this_device =NULL ; dev = link->priv; +if (link->dev_node) +unregister_netdev (dev); +ray_release (link); local = (ray_dev_t *)dev->priv;del_timer (&local->timer);if (link->priv) { -if (link->dev_node)unregister_netdev (dev);free_netdev (dev); }DEBUG (2 ,"ray_cs ray_detach ending\n" );
drivers/net/wireless/spectrum_cs.c +3 -2
@@ -626,14 +626,15 @@ static void spectrum_cs_detach(struct pc {struct net_device *dev = link->priv; -spectrum_cs_release (link); -DEBUG (0 ,PFX "detach: link=%p link->dev_node=%p\n" , link, link->dev_node);if (link->dev_node) {DEBUG (0 ,PFX "About to unregister net device %p\n" , dev);unregister_netdev (dev); } + +spectrum_cs_release (link); +free_orinocodev (dev); }/* spectrum_cs_detach */
drivers/net/wireless/wavelan_cs.c +5 -4
@@ -4681,6 +4681,11 @@ #ifdef DEBUG_CALLBACK_TRACEprintk (KERN_DEBUG "-> wavelan_detach(0x%p)\n" , link);#endif +/* Remove ourselves from the kernel list of ethernet devices */ +/* Warning : can't be called from interrupt, timer or wavelan_close() */ +if (link->dev_node) +unregister_netdev (dev); +/* Some others haven't done their job : give them another chance */ wv_pcmcia_release (link);
@@ -4689,10 +4694,6 @@ #endif {struct net_device * dev = (struct net_device *) link->priv; -/* Remove ourselves from the kernel list of ethernet devices */ -/* Warning : can't be called from interrupt, timer or wavelan_close() */ -if (link->dev_node) -unregister_netdev (dev); link->dev_node =NULL ; ((net_local *)netdev_priv (dev))->link =NULL ; ((net_local *)netdev_priv (dev))->dev =NULL ;