[PATCH] RRM: do not set DELAYED_BA & IMM_BA bits in neighbor report

[Pablo MG]

The bits `Delayed Block Ack` and `Immediate Block Ack` in the
Capabilities subfield of the Neighbor Report element became reserved
bits between 802.11-2016 and 802.11-2020. Do not set those reserved
bits.
---
  src/ap/neighbor_db.c     | 3 +--
  wpa_supplicant/wnm_sta.c | 4 ----
  2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/ap/neighbor_db.c b/src/ap/neighbor_db.c
index 1768982d8..0239ec259 100644
--- 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 881c0af6f..e9bd6d17e 100644
--- 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))
-- 
2.50.1