OSDN Git Service

wifi: cfg80211: Update RNR parsing to align with Draft P802.11be_D2.0
authorIlan Peer <ilan.peer@intel.com>
Wed, 3 Aug 2022 15:02:56 +0000 (18:02 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 25 Aug 2022 08:40:50 +0000 (10:40 +0200)
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>
net/wireless/scan.c

index 0134e5d..5382fc2 100644 (file)
@@ -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;