diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-16 13:41:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-16 13:41:55 -0700 |
| commit | d8d326dc7ae6bec2a999d674c5babb6bf490587a (patch) | |
| tree | 0169a23e34712e4a34db9c3dd658c14a59ded5d9 /drivers/net/wireless/iwlwifi/iwl-sta.c | |
| parent | fed396a585d8e1870b326f2e8e1888a72957abb8 (diff) | |
| parent | 021570e55b7152843376b9d9f60624e3e05ac054 (diff) | |
| download | kernel_samsung_smdk4412-d8d326dc7ae6bec2a999d674c5babb6bf490587a.zip kernel_samsung_smdk4412-d8d326dc7ae6bec2a999d674c5babb6bf490587a.tar.gz kernel_samsung_smdk4412-d8d326dc7ae6bec2a999d674c5babb6bf490587a.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-sta.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 83a2636..c27c13f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c @@ -1373,10 +1373,14 @@ int iwl_mac_sta_remove(struct ieee80211_hw *hw, IWL_DEBUG_INFO(priv, "received request to remove station %pM\n", sta->addr); + mutex_lock(&priv->mutex); + IWL_DEBUG_INFO(priv, "proceeding to remove station %pM\n", + sta->addr); ret = iwl_remove_station(priv, sta_common->sta_id, sta->addr); if (ret) IWL_ERR(priv, "Error removing station %pM\n", sta->addr); + mutex_unlock(&priv->mutex); return ret; } EXPORT_SYMBOL(iwl_mac_sta_remove); |