mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mwl8k: don't call SET_AID if we're not associated 

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Lennert Buytenhek 2010-01-12 13:47:37 +01:00 committed by John W. Linville
parent 9189c10087
commit c97470dd25
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/mwl8k.c
View File

@ -3261,9 +3261,9 @@ mwl8k_bss_info_changed_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
/* /*
* Get the AP's legacy and MCS rates. * Get the AP's legacy and MCS rates.
*/ */
ap_legacy_rates = 0;
if (vif->bss_conf.assoc) { if (vif->bss_conf.assoc) {
struct ieee80211_sta *ap; struct ieee80211_sta *ap;
rcu_read_lock(); rcu_read_lock();
ap = ieee80211_find_sta(vif, vif->bss_conf.bssid); ap = ieee80211_find_sta(vif, vif->bss_conf.bssid);
@ -3301,8 +3301,9 @@ mwl8k_bss_info_changed_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
goto out; goto out;
} }
if (((changed & BSS_CHANGED_ASSOC) && vif->bss_conf.assoc) || if (vif->bss_conf.assoc &&
(changed & (BSS_CHANGED_ERP_CTS_PROT | BSS_CHANGED_HT))) { (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_ERP_CTS_PROT |
BSS_CHANGED_HT))) {
rc = mwl8k_cmd_set_aid(hw, vif, ap_legacy_rates); rc = mwl8k_cmd_set_aid(hw, vif, ap_legacy_rates);
if (rc) if (rc)
goto out; goto out;