Update Capability Information field definitions to IEEE Std 802.11-2024

Add the new assigned fields and comment out deprecated fields that are
now reserved.

Signed-off-by: Jouni Malinen <jouni.malinen@oss.qualcomm.com>

diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
index 469fde277eecd6cc26f79c2dead9e879c9f24b6a..9d1e1083e39e2f773d56fc14fd8595485e5e203e 100644 (file)
--- a/src/common/ieee802_11_defs.h
+++ b/src/common/ieee802_11_defs.h
@@ -102,22 +102,23 @@
 
 #define WLAN_AUTH_CHALLENGE_LEN 128
 
+/* IEEE Std 802.11-2024, 9.4.1.4 (Capability Information field) */
 #define WLAN_CAPABILITY_ESS BIT(0)
 #define WLAN_CAPABILITY_IBSS BIT(1)
-#define WLAN_CAPABILITY_CF_POLLABLE BIT(2)
-#define WLAN_CAPABILITY_CF_POLL_REQUEST BIT(3)
+/* bit 2 is reserved (was WLAN_CAPABILITY_CF_POLLABLE) */
+/* bit 3 is reserved (was WLAN_CAPABILITY_CF_POLL_REQUEST) */
 #define WLAN_CAPABILITY_PRIVACY BIT(4)
 #define WLAN_CAPABILITY_SHORT_PREAMBLE BIT(5)
-#define WLAN_CAPABILITY_PBCC BIT(6)
-#define WLAN_CAPABILITY_CHANNEL_AGILITY BIT(7)
+/* bit 6 is reserved (was WLAN_CAPABILITY_PBCC) */
+/* bit 7 is reserved (was WLAN_CAPABILITY_CHANNEL_AGILITY) */
 #define WLAN_CAPABILITY_SPECTRUM_MGMT BIT(8)
 #define WLAN_CAPABILITY_QOS BIT(9)
 #define WLAN_CAPABILITY_SHORT_SLOT_TIME BIT(10)
 #define WLAN_CAPABILITY_APSD BIT(11)
 #define WLAN_CAPABILITY_RADIO_MEASUREMENT BIT(12)
-#define WLAN_CAPABILITY_DSSS_OFDM BIT(13)
-#define WLAN_CAPABILITY_DELAYED_BLOCK_ACK BIT(14)
-#define WLAN_CAPABILITY_IMM_BLOCK_ACK BIT(15)
+#define WLAN_CAPABILITY_EPD BIT(13)
+/* bit 14 is reserved (was WLAN_CAPABILITY_DELAYED_BLOCK_ACK) */
+/* bit 15 is reserved (was WLAN_CAPABILITY_IMM_BLOCK_ACK) */
 
 /* Status codes (IEEE Std 802.11-2020, 9.4.1.9, Table 9-50) */
 #define WLAN_STATUS_SUCCESS 0