Skip to content

Commit a0ed501

Browse files
benzeajmberg-intel
authored andcommitted
wifi: cfg80211: do not scan disabled links on 6GHz
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 <[email protected]> Signed-off-by: Gregory Greenman <[email protected]> Link: https://lore.kernel.org/r/20230618214436.4f7384006471.Iff8f1081e76a298bd25f9468abb3a586372cddaa@changeid Signed-off-by: Johannes Berg <[email protected]>
1 parent 2481b5d commit a0ed501

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

net/wireless/scan.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,13 @@ static int cfg80211_parse_ap_info(struct cfg80211_colocated_ap *entry,
587587
entry->short_ssid_valid = true;
588588

589589
bss_params = tbtt_info->bss_params;
590+
591+
/* Ignore disabled links */
592+
if (length >= offsetofend(typeof(*tbtt_info), mld_params)) {
593+
if (le16_get_bits(tbtt_info->mld_params.params,
594+
IEEE80211_RNR_MLD_PARAMS_DISABLED_LINK))
595+
return -EINVAL;
596+
}
590597
} else {
591598
struct ieee80211_tbtt_info_7_8_9 *tbtt_info = (void *)pos;
592599

0 commit comments

Comments
 (0)