diff options
| author | Wey-Yi Guy | 2009-08-21 22:34:25 +0200 |
|---|---|---|
| committer | John W. Linville | 2009-08-28 20:40:39 +0200 |
| commit | 5bddf54962bf68002816df710348ba197d6391bb (patch) | |
| tree | 7bbe9c00977636a8f5645e5e46c1f4c64a233f11 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | iwlwifi: fix remove key error (diff) | |
| download | kernel-qcow2-linux-5bddf54962bf68002816df710348ba197d6391bb.tar.gz kernel-qcow2-linux-5bddf54962bf68002816df710348ba197d6391bb.tar.xz kernel-qcow2-linux-5bddf54962bf68002816df710348ba197d6391bb.zip | |
iwlwifi: fix unloading driver while scanning
If NetworkManager is busy scanning when user
tries to unload the module, the driver can not be unloaded
because HW still scanning.
Make sure driver sends abort scan host command to uCode if it
is in the middle of scanning during driver unload.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 533b393e8cf6..00457bff1ed1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -2155,7 +2155,7 @@ static void iwl_mac_stop(struct ieee80211_hw *hw) priv->is_open = 0; - if (iwl_is_ready_rf(priv)) { + if (iwl_is_ready_rf(priv) || test_bit(STATUS_SCAN_HW, &priv->status)) { /* stop mac, cancel any scan request and clear * RXON_FILTER_ASSOC_MSK BIT */ |