RRM: Do not set DELAYED_BA and IMM_BA bits in neighbor report

The bits `Delayed Block Ack` and `Immediate Block Ack` in the
Capabilities subfield of the Neighbor Report element became reserved
bits between IEEE Std 802.11-2016 and IEEE Std 802.11-2020. Do not set
those reserved bits.

Signed-off-by: Pablo Martin-Gomez <pmartin-gomez@freebox.fr>

diff --git a/src/ap/neighbor_db.c b/src/ap/neighbor_db.c
index 1768982d8c2d7416c8c8267411b8d888e2e6577c..0239ec259f77cb88fdec8ebdca8ebade70b700ef 100644 (file)
--- a/src/ap/neighbor_db.c
+++ b/src/ap/neighbor_db.c
@@ -264,8 +264,7 @@ void hostapd_neighbor_set_own_report(struct hostapd_data *hapd)
        }
 
        if (ht) {
-               bssid_info |= NEI_REP_BSSID_INFO_HT |
-                       NEI_REP_BSSID_INFO_DELAYED_BA;
+               bssid_info |= NEI_REP_BSSID_INFO_HT;
                if (vht)
                        bssid_info |= NEI_REP_BSSID_INFO_VHT;
        }

diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
index 881c0af6fc5134c659da6b97887269a1b52b549f..e9bd6d17eba476223a346710f43765c3c5008f78 100644 (file)
--- a/wpa_supplicant/wnm_sta.c
+++ b/wpa_supplicant/wnm_sta.c
@@ -723,10 +723,6 @@ static u32 wnm_get_bss_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss)
                info |= NEI_REP_BSSID_INFO_APSD;
        if (bss->caps & WLAN_CAPABILITY_RADIO_MEASUREMENT)
                info |= NEI_REP_BSSID_INFO_RM;
-       if (bss->caps & WLAN_CAPABILITY_DELAYED_BLOCK_ACK)
-               info |= NEI_REP_BSSID_INFO_DELAYED_BA;
-       if (bss->caps & WLAN_CAPABILITY_IMM_BLOCK_ACK)
-               info |= NEI_REP_BSSID_INFO_IMM_BA;
        if (wpa_bss_ies_eq(bss, wpa_s->current_bss, WLAN_EID_MOBILITY_DOMAIN))
                info |= NEI_REP_BSSID_INFO_MOBILITY_DOMAIN;
        if (wpa_bss_ies_eq(bss, wpa_s->current_bss, WLAN_EID_HT_CAP))