1 --- a/net/mac80211/util.c
2 +++ b/net/mac80211/util.c
3 @@ -1402,6 +1402,7 @@ static size_t ieee802_11_find_bssid_prof
4 if (!bss_bssid || !transmitter_bssid)
8 for_each_element_id(elem, WLAN_EID_MULTIPLE_BSSID, start, len) {
11 --- a/net/wireless/scan.c
12 +++ b/net/wireless/scan.c
13 @@ -2013,6 +2013,7 @@ static const struct element
14 const struct element *next_mbssid;
15 const struct element *next_sub;
18 next_mbssid = cfg80211_find_elem(WLAN_EID_MULTIPLE_BSSID,
20 ielen - (mbssid_end - ie));
21 @@ -2094,6 +2095,7 @@ static void cfg80211_parse_mbssid_data(s
23 struct cfg80211_bss *bss;
28 if (!cfg80211_find_ie(WLAN_EID_MULTIPLE_BSSID, ie, ielen))
29 @@ -2254,6 +2256,7 @@ cfg80211_update_notlisted_nontrans(struc
30 const struct cfg80211_bss_ies *old;
34 lockdep_assert_held(&wiphy_to_rdev(wiphy)->bss_lock);
36 ie = mgmt->u.probe_resp.variable;
37 @@ -2472,6 +2475,7 @@ cfg80211_inform_bss_frame_data(struct wi
38 res = cfg80211_inform_single_bss_frame_data(wiphy, data, mgmt,
42 /* don't do any further MBSSID handling for S1G */
43 if (ieee80211_is_s1g_beacon(mgmt->frame_control))