From e646b11feafb008de8cd1de03849bbc0ba47cc0e Mon Sep 17 00:00:00 2001 From: Aloka Dixit Date: Tue, 19 Apr 2022 11:04:15 -0700 Subject: [PATCH] EHT: Indicate EHT support in Neighbor Report element Set bit 21 in the neighbor report for an EHT AP as described in IEEE P802.11be/D1.5, 9.4.2.36. Also move the check for HE outside the check for HT as neither HT nor VHT are enabled in the 6 GHz band. Signed-off-by: Aloka Dixit Signed-off-by: Pradeep Kumar Chitrapu --- src/ap/neighbor_db.c | 7 +++++-- src/common/ieee802_11_defs.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ap/neighbor_db.c b/src/ap/neighbor_db.c index 229edd2a9..e37324f3d 100644 --- a/src/ap/neighbor_db.c +++ b/src/ap/neighbor_db.c @@ -225,6 +225,7 @@ void hostapd_neighbor_set_own_report(struct hostapd_data *hapd) int ht = hapd->iconf->ieee80211n && !hapd->conf->disable_11n; int vht = hapd->iconf->ieee80211ac && !hapd->conf->disable_11ac; int he = hapd->iconf->ieee80211ax && !hapd->conf->disable_11ax; + bool eht = he && hapd->iconf->ieee80211be && !hapd->conf->disable_11be; struct wpa_ssid_value ssid; u8 channel, op_class; u8 center_freq1_idx = 0, center_freq2_idx = 0; @@ -260,10 +261,12 @@ void hostapd_neighbor_set_own_report(struct hostapd_data *hapd) /* VHT bit added in IEEE P802.11-REVmc/D4.3 */ if (vht) bssid_info |= NEI_REP_BSSID_INFO_VHT; - if (he) - bssid_info |= NEI_REP_BSSID_INFO_HE; } + if (he) + bssid_info |= NEI_REP_BSSID_INFO_HE; + if (eht) + bssid_info |= NEI_REP_BSSID_INFO_EHT; /* TODO: Set NEI_REP_BSSID_INFO_MOBILITY_DOMAIN if MDE is set */ if (ieee80211_freq_to_channel_ext(hapd->iface->freq, diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h index 9b5169009..5c604b915 100644 --- a/src/common/ieee802_11_defs.h +++ b/src/common/ieee802_11_defs.h @@ -2193,6 +2193,7 @@ enum phy_type { #define NEI_REP_BSSID_INFO_VHT BIT(12) #define NEI_REP_BSSID_INFO_FTM BIT(13) #define NEI_REP_BSSID_INFO_HE BIT(14) +#define NEI_REP_BSSID_INFO_EHT BIT(21) /* * IEEE P802.11-REVmc/D5.0 Table 9-152 - HT/VHT Operation Information