Skip to content

Commit

Permalink
mwl8k: prevent module unload hang
Browse files Browse the repository at this point in the history
We need to unregister our ieee80211_hw before resetting the chip, as
the former causes firmware commands to be issued which will time out
once the chip has been reset.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Acked-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Lennert Buytenhek authored and John W. Linville committed Aug 7, 2009
1 parent a94cc97 commit 60aa569
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/mwl8k.c
Original file line number Diff line number Diff line change
Expand Up @@ -3733,6 +3733,8 @@ static void __devexit mwl8k_remove(struct pci_dev *pdev)

ieee80211_stop_queues(hw);

ieee80211_unregister_hw(hw);

/* Remove tx reclaim tasklet */
tasklet_kill(&priv->tx_reclaim_task);

Expand All @@ -3746,8 +3748,6 @@ static void __devexit mwl8k_remove(struct pci_dev *pdev)
for (i = 0; i < MWL8K_TX_QUEUES; i++)
mwl8k_txq_reclaim(hw, i, 1);

ieee80211_unregister_hw(hw);

for (i = 0; i < MWL8K_TX_QUEUES; i++)
mwl8k_txq_deinit(hw, i);

Expand Down

0 comments on commit 60aa569

Please sign in to comment.