From 0dbc894f466e6f35fb6b5c1bf673cc65c12a154a Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 20 May 2019 09:55:10 +0200 Subject: [PATCH] HE: Fix HE Capabilities indication from driver The PPE Thresholds information in the end of the HE Capabilities element is optional and of variable length. struct he_ppe_threshold was not really used correctly for encoding this, so remove it and just reserve enough space for the information. Signed-off-by: Shashidhar Lakkavalli Signed-off-by: John Crispin --- src/drivers/driver.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/drivers/driver.h b/src/drivers/driver.h index edf0b370a..d75884330 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -158,20 +158,10 @@ struct hostapd_channel_data { unsigned int dfs_cac_ms; }; -#define HE_MAX_NUM_SS 8 #define HE_MAX_MAC_CAPAB_SIZE 6 #define HE_MAX_PHY_CAPAB_SIZE 11 #define HE_MAX_MCS_CAPAB_SIZE 12 -/** - * struct he_ppe_threshold - IEEE 802.11ax HE PPE Threshold - */ -struct he_ppe_threshold { - u32 numss_m1; - u32 ru_count; - u32 ppet16_ppet8_ru3_ru0[HE_MAX_NUM_SS]; -}; - /** * struct he_capabilities - IEEE 802.11ax HE capabilities */ @@ -180,7 +170,7 @@ struct he_capabilities { u8 phy_cap[HE_MAX_PHY_CAPAB_SIZE]; u8 mac_cap[HE_MAX_MAC_CAPAB_SIZE]; u8 mcs[HE_MAX_MCS_CAPAB_SIZE]; - struct he_ppe_threshold ppet; + u8 ppet[25]; }; #define HOSTAPD_MODE_FLAG_HT_INFO_KNOWN BIT(0)