diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2022-07-22 11:01:18 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2022-07-22 14:28:50 +0200 |
| commit | a94c90d32193ceac2aa5fc36f3833deeeb85bf8d (patch) | |
| tree | 26d386c1b77b3484bbe751da0cbd5704c933b38b /net/mac80211 | |
| parent | 9f781533bb028edb3e8e10e79fb87e85a4dc6987 (diff) | |
| download | lwn-a94c90d32193ceac2aa5fc36f3833deeeb85bf8d.tar.gz lwn-a94c90d32193ceac2aa5fc36f3833deeeb85bf8d.zip | |
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: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 8c614daedeb8..3d4ab711f0d1 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2878,7 +2878,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, sta_info_flush(sdata); /* finally reset all BSS / config parameters */ - changed |= ieee80211_reset_erp_info(sdata); + if (!sdata->vif.valid_links) + changed |= ieee80211_reset_erp_info(sdata); ieee80211_led_assoc(local, 0); changed |= BSS_CHANGED_ASSOC; @@ -2920,10 +2921,11 @@ 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); } - ieee80211_bss_info_change_notify(sdata, changed); - /* disassociated - set to defaults now */ ieee80211_set_wmm_default(&sdata->deflink, false, false); |