Commit a94c90d3 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: mlme: fix disassoc with MLO 



In MLO we shouldn't call ieee80211_bss_info_change_notify(),
call that only (for backward compatibility) without MLO, and
otherwise ieee80211_vif_cfg_change_notify().

Similarly, ieee80211_reset_erp_info() only applies to the
current link, and in MLO we assume the driver doesn't really
need that.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 9f781533

net/mac80211/mlme.c

+5 −3
Original line number Diff line number Diff line
@@ -2878,6 +2878,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, 
	sta_info_flush(sdata);



	/* finally reset all BSS / config parameters */

	if (!sdata->vif.valid_links)

		changed |= ieee80211_reset_erp_info(sdata);



	ieee80211_led_assoc(local, 0);
@@ -2920,9 +2921,10 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, 
		changed |= BSS_CHANGED_QOS;

		/* The BSSID (not really interesting) and HT changed */

		changed |= BSS_CHANGED_BSSID | BSS_CHANGED_HT;

	}



		ieee80211_bss_info_change_notify(sdata, changed);

	} else {

		ieee80211_vif_cfg_change_notify(sdata, changed);

	}



	/* disassociated - set to defaults now */

	ieee80211_set_wmm_default(&sdata->deflink, false, false);