Skip to content

Commit

Permalink
wifi: cfg80211: do not scan disabled links on 6GHz
Browse files Browse the repository at this point in the history
If a link is disabled on 6GHz, we should not send a probe request on the
channel to resolve it. Simply skip such RNR entries so that the link is
ignored.

Userspace can still see the link in the RNR and may generate an ML probe
request in order to associate to the (currently) disabled link.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230618214436.4f7384006471.Iff8f1081e76a298bd25f9468abb3a586372cddaa@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Benjamin Berg authored and Johannes Berg committed Jun 19, 2023
1 parent 2481b5d commit a0ed501
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions net/wireless/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,13 @@ static int cfg80211_parse_ap_info(struct cfg80211_colocated_ap *entry,
entry->short_ssid_valid = true;

bss_params = tbtt_info->bss_params;

/* Ignore disabled links */
if (length >= offsetofend(typeof(*tbtt_info), mld_params)) {
if (le16_get_bits(tbtt_info->mld_params.params,
IEEE80211_RNR_MLD_PARAMS_DISABLED_LINK))
return -EINVAL;
}
} else {
struct ieee80211_tbtt_info_7_8_9 *tbtt_info = (void *)pos;

Expand Down

0 comments on commit a0ed501

Please sign in to comment.