diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-02-08 11:57:43 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2024-02-08 11:58:25 +0300 |
| commit | af4acac7caa17cf10742c80e2dd859e21d06abb9 (patch) | |
| tree | 650468891990d2f8edc6726aab697ff35d8b9673 /include/net | |
| parent | 94dd7ce1885e530a7b10bbe50d5d68ba1bb99e6e (diff) | |
| parent | 0647903efbc84b772325b4d24d9487e24d6d1e03 (diff) | |
| download | linux-af4acac7caa17cf10742c80e2dd859e21d06abb9.tar.xz | |
Merge wireless into wireless-next
There are some changes coming to wireless-next that will
otherwise cause conflicts, pull wireless in first to be
able to resolve that when applying the individual changes
rather than having to do merge resolution later.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/cfg80211.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 51b9e6fa12f8..5b42bfc1b660 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -2902,6 +2902,8 @@ struct cfg80211_bss_ies { * own the beacon_ies, but they're just pointers to the ones from the * @hidden_beacon_bss struct) * @proberesp_ies: the information elements from the last Probe Response frame + * @proberesp_ecsa_stuck: ECSA element is stuck in the Probe Response frame, + * cannot rely on it having valid data * @hidden_beacon_bss: in case this BSS struct represents a probe response from * a BSS that hides the SSID in its beacon, this points to the BSS struct * that holds the beacon data. @beacon_ies is still valid, of course, and @@ -2942,6 +2944,8 @@ struct cfg80211_bss { u8 chains; s8 chain_signal[IEEE80211_MAX_CHAINS]; + u8 proberesp_ecsa_stuck:1; + u8 bssid_index; u8 max_bssid_indicator; |