Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c97470dd authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by John W. Linville
Browse files

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



Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9189c100

drivers/net/wireless/mwl8k.c

+4 −3
Original line number Diff line number Diff line
@@ -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.

	 */

	ap_legacy_rates = 0;

	if (vif->bss_conf.assoc) {

		struct ieee80211_sta *ap;



		rcu_read_lock();



		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;

	}



	if (((changed & BSS_CHANGED_ASSOC) && vif->bss_conf.assoc) ||

	    (changed & (BSS_CHANGED_ERP_CTS_PROT | BSS_CHANGED_HT))) {

	if (vif->bss_conf.assoc &&

	    (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_ERP_CTS_PROT |

			BSS_CHANGED_HT))) {

		rc = mwl8k_cmd_set_aid(hw, vif, ap_legacy_rates);

		if (rc)

			goto out;