diff options
| author | Emmanuel Grumbach | 2012-02-17 19:34:53 +0100 |
|---|---|---|
| committer | Wey-Yi Guy | 2012-02-17 19:36:39 +0100 |
| commit | 78e5a464320338a90b0367ab9cc58029393a9824 (patch) | |
| tree | a22d40b4773ccf4435ff04ac499598b0c1187bbb /drivers/net/wireless/iwlwifi/iwl-mac80211.c | |
| parent | iwlwifi: change args to ucode routines (diff) | |
| download | kernel-qcow2-linux-78e5a464320338a90b0367ab9cc58029393a9824.tar.gz kernel-qcow2-linux-78e5a464320338a90b0367ab9cc58029393a9824.tar.xz kernel-qcow2-linux-78e5a464320338a90b0367ab9cc58029393a9824.zip | |
iwlwifi: kill iwl_down and s/__iwl_down/iwl_down
iwl_down was just a wrapper around __iwl_down which was called from
one place only. Replace it to direct call to iwl_down. Add lockdep
warning in iwl_down to ensure it was called with the mutex held.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-mac80211.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c index ca0c46506674..90d8081426f6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c +++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c @@ -296,7 +296,7 @@ static int __iwl_up(struct iwl_priv *priv) error: set_bit(STATUS_EXIT_PENDING, &priv->shrd->status); - __iwl_down(priv); + iwl_down(priv); clear_bit(STATUS_EXIT_PENDING, &priv->shrd->status); IWL_ERR(priv, "Unable to initialize device.\n"); @@ -341,7 +341,11 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw) priv->is_open = 0; + mutex_lock(&priv->shrd->mutex); iwl_down(priv); + mutex_unlock(&priv->shrd->mutex); + + iwl_cancel_deferred_work(priv); flush_workqueue(priv->workqueue); |