Skip to content

Commit

Permalink
wifi: mac80211: mlme: fix disassoc with MLO
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Berg committed Jul 22, 2022
1 parent 9f78153 commit a94c90d
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions net/mac80211/mlme.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit a94c90d

Please sign in to comment.