wifi: cfg80211: Update RNR parsing to align with Draft P802.11be_D2.0

Based on changes in the specification the TBTT information in
the RNR can include MLD information, so update the parsing to
allow extracting the short SSID information in such a case.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 0134e5d5c81a4f9297fa7d8d5fdc45f0e6ae21eb..5382fc2003db4214b976449c11df2147681158d9 100644 (file)
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -540,7 +540,7 @@ static int cfg80211_parse_ap_info(struct cfg80211_colocated_ap *entry,
        memcpy(entry->bssid, pos, ETH_ALEN);
        pos += ETH_ALEN;
 
-       if (length == IEEE80211_TBTT_INFO_OFFSET_BSSID_SSSID_BSS_PARAM) {
+       if (length >= IEEE80211_TBTT_INFO_OFFSET_BSSID_SSSID_BSS_PARAM) {
                memcpy(&entry->short_ssid, pos,
                       sizeof(entry->short_ssid));
                entry->short_ssid_valid = true;