From: Meenakshi Venkataraman Date: Wed, 16 May 2012 20:49:48 +0000 (+0200) Subject: iwlwifi: do not send lq cmd when station add fails X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f4c37176ef555560a1d13bc4bf2cf3debd442f40;p=linux-beck.git iwlwifi: do not send lq cmd when station add fails When adding a station fails in iwl_restore_stations, the driver treats it like a successful station add and sends a link quality command, when it it shouldn't. This patch fixes one of the potential sources for kernel warnings like this one: WARNING: at drivers/net/wireless/iwlwifi/iwl-agn-sta.c:905 iwl_send_lq_cmd+0x130/0x217 [iwlwifi]() Hardware name: 3323A2G Modules linked in: ... Pid: 17359, comm: kworker/u:2 Tainted: G O 3.3.0-wl+ #1 Call Trace: [] warn_slowpath_common+0x7e/0x96 [] warn_slowpath_null+0x15/0x17 [] iwl_send_lq_cmd+0x130/0x217 [iwlwifi] [] iwl_restore_stations+0x209/0x289 [iwlwifi] [] iwlagn_commit_rxon+0x602/0x7bd [iwlwifi] [] iwlagn_bss_info_changed+0x247/0x31a [iwlwifi] [] ieee80211_bss_info_change_notify+0x1a5/0x1ba [mac80211] [] ieee80211_destroy_auth_data+0x4b/0x70 [mac80211] [] ieee80211_sta_work+0xb5/0x954 [mac80211] Signed-off-by: Meenakshi Venkataraman Reviewed-by: Wey-Yi W Guy Reviewed-by: Emmanuel Grumbach Signed-off-by: Johannes Berg Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c index b31584e87bc7..aea07aab3c9e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c @@ -772,7 +772,7 @@ void iwl_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx) ~IWL_STA_DRIVER_ACTIVE; priv->stations[i].used &= ~IWL_STA_UCODE_INPROGRESS; - spin_unlock_bh(&priv->sta_lock); + continue; } /* * Rate scaling has already been initialized, send