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 <quic_alokad@quicinc.com>
Signed-off-by: Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com>
This commit is contained in:
Aloka Dixit 2022-04-19 11:04:15 -07:00 committed by Jouni Malinen
parent f915d52dee
commit e646b11fea
2 changed files with 6 additions and 2 deletions

View file

@ -225,6 +225,7 @@ void hostapd_neighbor_set_own_report(struct hostapd_data *hapd)
int ht = hapd->iconf->ieee80211n && !hapd->conf->disable_11n; int ht = hapd->iconf->ieee80211n && !hapd->conf->disable_11n;
int vht = hapd->iconf->ieee80211ac && !hapd->conf->disable_11ac; int vht = hapd->iconf->ieee80211ac && !hapd->conf->disable_11ac;
int he = hapd->iconf->ieee80211ax && !hapd->conf->disable_11ax; int he = hapd->iconf->ieee80211ax && !hapd->conf->disable_11ax;
bool eht = he && hapd->iconf->ieee80211be && !hapd->conf->disable_11be;
struct wpa_ssid_value ssid; struct wpa_ssid_value ssid;
u8 channel, op_class; u8 channel, op_class;
u8 center_freq1_idx = 0, center_freq2_idx = 0; 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 */ /* VHT bit added in IEEE P802.11-REVmc/D4.3 */
if (vht) if (vht)
bssid_info |= NEI_REP_BSSID_INFO_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 */ /* TODO: Set NEI_REP_BSSID_INFO_MOBILITY_DOMAIN if MDE is set */
if (ieee80211_freq_to_channel_ext(hapd->iface->freq, if (ieee80211_freq_to_channel_ext(hapd->iface->freq,

View file

@ -2193,6 +2193,7 @@ enum phy_type {
#define NEI_REP_BSSID_INFO_VHT BIT(12) #define NEI_REP_BSSID_INFO_VHT BIT(12)
#define NEI_REP_BSSID_INFO_FTM BIT(13) #define NEI_REP_BSSID_INFO_FTM BIT(13)
#define NEI_REP_BSSID_INFO_HE BIT(14) #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 * IEEE P802.11-REVmc/D5.0 Table 9-152 - HT/VHT Operation Information