Remove definition of EMLMR Delay field from EML Capabilities

This was removed in IEEE P802.11be/D4.0 and the related bits are
reserved in IEEE Std 802.11b-2024.

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 d1e0e86c2dff86cc56043461dd1ca31465ad6bc8..797521eb693e0701c9f069d244528aee18f35791 100644 (file)
--- a/src/common/ieee802_11_defs.h
+++ b/src/common/ieee802_11_defs.h
@@ -2864,7 +2864,6 @@ struct eht_ml_basic_common_info {
 #define EHT_ML_EML_CAPA_EMLSR_PADDING_DELAY_MASK 0x000e
 #define EHT_ML_EML_CAPA_EMLSR_TRANS_DELAY_MASK   0x0070
 #define EHT_ML_EML_CAPA_EMLMR_SUPP               0x0080
-#define EHT_ML_EML_CAPA_EMLMR_DELAY_MASK         0x0700
 #define EHT_ML_EML_CAPA_TRANSITION_TIMEOUT_MASK  0x7800
 #define EHT_ML_EML_CAPA_RESERVED                 0x8780
 

diff --git a/wlantest/rx_mgmt.c b/wlantest/rx_mgmt.c
index 47dbc600992e395766212446f137d820e6a9ac10..c2f2c47a06557d7d1a973dba61ea7eaad6d0e32e 100644 (file)
--- a/wlantest/rx_mgmt.c
+++ b/wlantest/rx_mgmt.c
@@ -156,14 +156,13 @@ static void parse_basic_ml(const u8 *ie, size_t len, bool ap,
                eml = WPA_GET_LE16(pos);
                pos += 2;
                wpa_printf(MSG_DEBUG,
-                          "EML Capabilities: 0x%x (EMLSR=%u EMLSR_Padding_Delay=%u EMLSR_Transition_Delay=%u EMLMR=%u EMLMR_Delay=%u Transition_Timeout=%u Reserved=%u)",
+                          "EML Capabilities: 0x%x (EMLSR=%u EMLSR_Padding_Delay=%u EMLSR_Transition_Delay=%u EMLMR=%u Transition_Timeout=%u Reserved=%u)",
                           eml,
                           !!(eml & EHT_ML_EML_CAPA_EMLSR_SUPP),
                           (eml & EHT_ML_EML_CAPA_EMLSR_PADDING_DELAY_MASK) >>
                           1,
                           (eml & EHT_ML_EML_CAPA_EMLSR_TRANS_DELAY_MASK) >> 4,
                           !!(eml & EHT_ML_EML_CAPA_EMLMR_SUPP),
-                          (eml & EHT_ML_EML_CAPA_EMLMR_DELAY_MASK) >> 8,
                           (eml & EHT_ML_EML_CAPA_TRANSITION_TIMEOUT_MASK) >>
                           11,
                           !!(eml & BIT(15)));
@@ -481,14 +480,13 @@ static void parse_reconfig_ml(const u8 *ie, size_t len,
                eml = WPA_GET_LE16(pos);
                pos += 2;
                wpa_printf(MSG_DEBUG,
-                          "EML Capabilities: 0x%x (EMLSR=%u EMLSR_Padding_Delay=%u EMLSR_Transition_Delay=%u EMLMR=%u EMLMR_Delay=%u Transition_Timeout=%u Reserved=%u)",
+                          "EML Capabilities: 0x%x (EMLSR=%u EMLSR_Padding_Delay=%u EMLSR_Transition_Delay=%u EMLMR=%u Transition_Timeout=%u Reserved=%u)",
                           eml,
                           !!(eml & EHT_ML_EML_CAPA_EMLSR_SUPP),
                           (eml & EHT_ML_EML_CAPA_EMLSR_PADDING_DELAY_MASK) >>
                           1,
                           (eml & EHT_ML_EML_CAPA_EMLSR_TRANS_DELAY_MASK) >> 4,
                           !!(eml & EHT_ML_EML_CAPA_EMLMR_SUPP),
-                          (eml & EHT_ML_EML_CAPA_EMLMR_DELAY_MASK) >> 8,
                           (eml & EHT_ML_EML_CAPA_TRANSITION_TIMEOUT_MASK) >>
                           11,
                           !!(eml & BIT(15)));