Pārlūkot izejas kodu

qcacld-3.0: Remove HT Capabilities related CFG from WNI

Removed the unused HT Capabilities related CFG Items from WNI CFG
enum

Change-Id: I73fbb3640c1a1463331ff8e9f11eef92126611d8
CRs-Fixed: 2344331
Vignesh Viswanathan 6 gadi atpakaļ
vecāks
revīzija
949794f210

+ 0 - 67
core/mac/inc/wni_cfg.h

@@ -31,7 +31,6 @@ enum {
 	WNI_CFG_DOT11_MODE,
 	WNI_CFG_VALID_CHANNEL_LIST,
 	WNI_CFG_APSD_ENABLED,
-	WNI_CFG_SHORT_PREAMBLE,
 	WNI_CFG_11D_ENABLED,
 	WNI_CFG_MAX_TX_POWER_2_4,
 	WNI_CFG_MAX_TX_POWER_5,
@@ -40,16 +39,8 @@ enum {
 	WNI_CFG_11H_ENABLED,
 	WNI_CFG_LOCAL_POWER_CONSTRAINT,
 	WNI_CFG_SCAN_CONTROL_LIST,
-	WNI_CFG_HT_CAP_INFO,
-	WNI_CFG_HT_AMPDU_PARAMS,
-	WNI_CFG_EXT_HT_CAP_INFO,
 	WNI_CFG_TX_BF_CAP,
 	WNI_CFG_AS_CAP,
-	WNI_CFG_HT_INFO_FIELD1,
-	WNI_CFG_HT_INFO_FIELD2,
-	WNI_CFG_HT_INFO_FIELD3,
-	WNI_CFG_MPDU_DENSITY,
-	WNI_CFG_MAX_RX_AMPDU_FACTOR,
 	WNI_CFG_SCAN_IN_POWERSAVE,
 	WNI_CFG_IBSS_AUTO_BSSID,
 	WNI_CFG_WPS_UUID,
@@ -426,14 +417,6 @@ enum {
 #define WNI_CFG_BLOCK_ACK_ENABLED_DELAYED    0
 #define WNI_CFG_BLOCK_ACK_ENABLED_IMMEDIATE    1
 
-#define WNI_CFG_HT_RX_STBC_STAMIN    0
-#define WNI_CFG_HT_RX_STBC_STAMAX    3
-#define WNI_CFG_HT_RX_STBC_STADEF    1
-
-#define WNI_CFG_HT_CAP_INFO_STAMIN    0
-#define WNI_CFG_HT_CAP_INFO_STAMAX    65535
-#define WNI_CFG_HT_CAP_INFO_STADEF    364
-
 #define WNI_CFG_HT_CAP_INFO_ADVANCE_CODING    0
 #define WNI_CFG_HT_CAP_INFO_SUPPORTED_CHAN_WIDTH_SET    1
 #define WNI_CFG_HT_CAP_INFO_SM_POWER_SAVE    2
@@ -449,26 +432,6 @@ enum {
 #define WNI_CFG_HT_CAP_INFO_STBC_CONTROL_FRAME    14
 #define WNI_CFG_HT_CAP_INFO_LSIG_TXOP_PROTECTION    15
 
-#define WNI_CFG_HT_AMPDU_PARAMS_STAMIN    0
-#define WNI_CFG_HT_AMPDU_PARAMS_STAMAX    255
-#define WNI_CFG_HT_AMPDU_PARAMS_STADEF    0
-
-#define WNI_CFG_HT_AMPDU_PARAMS_MAX_RX_AMPDU_FACTOR    0
-#define WNI_CFG_HT_AMPDU_PARAMS_MPDU_DENSITY    2
-#define WNI_CFG_HT_AMPDU_PARAMS_RESERVED    5
-
-#define WNI_CFG_EXT_HT_CAP_INFO_STAMIN    0
-#define WNI_CFG_EXT_HT_CAP_INFO_STAMAX    65535
-#define WNI_CFG_EXT_HT_CAP_INFO_STADEF    1024
-
-#define WNI_CFG_EXT_HT_CAP_INFO_PCO    0
-#define WNI_CFG_EXT_HT_CAP_INFO_TRANSITION_TIME    1
-#define WNI_CFG_EXT_HT_CAP_INFO_RESERVED1    3
-#define WNI_CFG_EXT_HT_CAP_INFO_MCS_FEEDBACK    8
-#define WNI_CFG_EXT_HT_CAP_INFO_HTC_SUPPORT    10
-#define WNI_CFG_EXT_HT_CAP_INFO_RD_RESPONDER    11
-#define WNI_CFG_EXT_HT_CAP_INFO_RESERVED2    12
-
 #define WNI_CFG_TX_BF_CAP_STAMIN    0
 #define WNI_CFG_TX_BF_CAP_STAMAX    4294967295
 #define WNI_CFG_TX_BF_CAP_STADEF    0
@@ -486,36 +449,6 @@ enum {
 #define WNI_CFG_AS_CAP_TX_SOUNDING_PPDUS    6
 #define WNI_CFG_AS_CAP_RESERVED    7
 
-#define WNI_CFG_HT_INFO_FIELD1_STAMIN    0
-#define WNI_CFG_HT_INFO_FIELD1_STAMAX    255
-#define WNI_CFG_HT_INFO_FIELD1_STADEF    15
-
-#define WNI_CFG_HT_INFO_FIELD1_SECONDARY_CHANNEL_OFFSET    0
-#define WNI_CFG_HT_INFO_FIELD1_RECOMMENDED_CHANNEL_WIDTH    2
-#define WNI_CFG_HT_INFO_FIELD1_RIFS_MODE    3
-#define WNI_CFG_HT_INFO_FIELD1_PSMP_ACCESS_ONLY    4
-#define WNI_CFG_HT_INFO_FIELD1_SERVICE_INTERVAL_GRANULARITY    5
-
-#define WNI_CFG_HT_INFO_FIELD2_STAMIN    0
-#define WNI_CFG_HT_INFO_FIELD2_STAMAX    65535
-#define WNI_CFG_HT_INFO_FIELD2_STADEF    0
-
-#define WNI_CFG_HT_INFO_FIELD2_OP_MODE    0
-#define WNI_CFG_HT_INFO_FIELD2_NON_GF_DEVICES_PRESENT    2
-#define WNI_CFG_HT_INFO_FIELD2_RESERVED    3
-
-#define WNI_CFG_HT_INFO_FIELD3_STAMIN    0
-#define WNI_CFG_HT_INFO_FIELD3_STAMAX    65535
-#define WNI_CFG_HT_INFO_FIELD3_STADEF    0
-
-#define WNI_CFG_HT_INFO_FIELD3_BASIC_STBC_MCS    0
-#define WNI_CFG_HT_INFO_FIELD3_DUAL_STBC_PROTECTION    7
-#define WNI_CFG_HT_INFO_FIELD3_SECONDARY_BEACON    8
-#define WNI_CFG_HT_INFO_FIELD3_LSIG_TXOP_PROTECTION_FULL_SUPPORT    9
-#define WNI_CFG_HT_INFO_FIELD3_PCO_ACTIVE    10
-#define WNI_CFG_HT_INFO_FIELD3_PCO_PHASE    11
-#define WNI_CFG_HT_INFO_FIELD3_RESERVED    12
-
 #define WNI_CFG_GREENFIELD_CAPABILITY_STAMIN    0
 #define WNI_CFG_GREENFIELD_CAPABILITY_STAMAX    1
 #define WNI_CFG_GREENFIELD_CAPABILITY_STADEF    0

+ 0 - 9
core/mac/src/cfg/cfg_param_name.c

@@ -46,7 +46,6 @@ const char *cfg_get_string(uint16_t cfg_id)
 	CASE_RETURN_STRING(WNI_CFG_DOT11_MODE);
 	CASE_RETURN_STRING(WNI_CFG_VALID_CHANNEL_LIST);
 	CASE_RETURN_STRING(WNI_CFG_APSD_ENABLED);
-	CASE_RETURN_STRING(WNI_CFG_SHORT_PREAMBLE);
 	CASE_RETURN_STRING(WNI_CFG_11D_ENABLED);
 	CASE_RETURN_STRING(WNI_CFG_MAX_TX_POWER_2_4);
 	CASE_RETURN_STRING(WNI_CFG_MAX_TX_POWER_5);
@@ -55,16 +54,8 @@ const char *cfg_get_string(uint16_t cfg_id)
 	CASE_RETURN_STRING(WNI_CFG_11H_ENABLED);
 	CASE_RETURN_STRING(WNI_CFG_LOCAL_POWER_CONSTRAINT);
 	CASE_RETURN_STRING(WNI_CFG_SCAN_CONTROL_LIST);
-	CASE_RETURN_STRING(WNI_CFG_HT_CAP_INFO);
-	CASE_RETURN_STRING(WNI_CFG_HT_AMPDU_PARAMS);
-	CASE_RETURN_STRING(WNI_CFG_EXT_HT_CAP_INFO);
 	CASE_RETURN_STRING(WNI_CFG_TX_BF_CAP);
 	CASE_RETURN_STRING(WNI_CFG_AS_CAP);
-	CASE_RETURN_STRING(WNI_CFG_HT_INFO_FIELD1);
-	CASE_RETURN_STRING(WNI_CFG_HT_INFO_FIELD2);
-	CASE_RETURN_STRING(WNI_CFG_HT_INFO_FIELD3);
-	CASE_RETURN_STRING(WNI_CFG_MPDU_DENSITY);
-	CASE_RETURN_STRING(WNI_CFG_MAX_RX_AMPDU_FACTOR);
 	CASE_RETURN_STRING(WNI_CFG_IBSS_AUTO_BSSID);
 	CASE_RETURN_STRING(WNI_CFG_WPS_UUID);
 	CASE_RETURN_STRING(WNI_CFG_TELE_BCN_WAKEUP_EN);

+ 0 - 54
core/mac/src/cfg/cfg_proc_msg.c

@@ -57,12 +57,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_APSD_ENABLED_STAMIN,
 	WNI_CFG_APSD_ENABLED_STAMAX,
 	WNI_CFG_APSD_ENABLED_STADEF},
-	{WNI_CFG_SHORT_PREAMBLE,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART,
-	WNI_CFG_SHORT_PREAMBLE_STAMIN,
-	WNI_CFG_SHORT_PREAMBLE_STAMAX,
-	WNI_CFG_SHORT_PREAMBLE_STADEF},
 	{WNI_CFG_11D_ENABLED,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_RESTART,
@@ -99,24 +93,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_RESTART |
 	CFG_CTL_NTF_LIM,
 	0, 0, 0},
-	{WNI_CFG_HT_CAP_INFO,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART | CFG_CTL_NTF_LIM,
-	WNI_CFG_HT_CAP_INFO_STAMIN,
-	WNI_CFG_HT_CAP_INFO_STAMAX,
-	WNI_CFG_HT_CAP_INFO_STADEF},
-	{WNI_CFG_HT_AMPDU_PARAMS,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART | CFG_CTL_NTF_LIM,
-	WNI_CFG_HT_AMPDU_PARAMS_STAMIN,
-	WNI_CFG_HT_AMPDU_PARAMS_STAMAX,
-	WNI_CFG_HT_AMPDU_PARAMS_STADEF},
-	{WNI_CFG_EXT_HT_CAP_INFO,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT | CFG_CTL_SAVE |
-	CFG_CTL_RESTART | CFG_CTL_NTF_LIM,
-	WNI_CFG_EXT_HT_CAP_INFO_STAMIN,
-	WNI_CFG_EXT_HT_CAP_INFO_STAMAX,
-	WNI_CFG_EXT_HT_CAP_INFO_STADEF},
 	{WNI_CFG_TX_BF_CAP,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_INT | CFG_CTL_RESTART |
 	CFG_CTL_NTF_LIM,
@@ -129,36 +105,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_AS_CAP_STAMIN,
 	WNI_CFG_AS_CAP_STAMAX,
 	WNI_CFG_AS_CAP_STADEF},
-	{WNI_CFG_HT_INFO_FIELD1,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART | CFG_CTL_NTF_LIM,
-	WNI_CFG_HT_INFO_FIELD1_STAMIN,
-	WNI_CFG_HT_INFO_FIELD1_STAMAX,
-	WNI_CFG_HT_INFO_FIELD1_STADEF},
-	{WNI_CFG_HT_INFO_FIELD2,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT | CFG_CTL_SAVE |
-	CFG_CTL_NTF_LIM,
-	WNI_CFG_HT_INFO_FIELD2_STAMIN,
-	WNI_CFG_HT_INFO_FIELD2_STAMAX,
-	WNI_CFG_HT_INFO_FIELD2_STADEF},
-	{WNI_CFG_HT_INFO_FIELD3,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT | CFG_CTL_SAVE |
-	CFG_CTL_NTF_LIM,
-	WNI_CFG_HT_INFO_FIELD3_STAMIN,
-	WNI_CFG_HT_INFO_FIELD3_STAMAX,
-	WNI_CFG_HT_INFO_FIELD3_STADEF},
-	{WNI_CFG_MPDU_DENSITY,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART | CFG_CTL_NTF_LIM,
-	WNI_CFG_MPDU_DENSITY_STAMIN,
-	WNI_CFG_MPDU_DENSITY_STAMAX,
-	WNI_CFG_MPDU_DENSITY_STADEF},
-	{WNI_CFG_MAX_RX_AMPDU_FACTOR,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_RESTART | CFG_CTL_NTF_LIM,
-	WNI_CFG_MAX_RX_AMPDU_FACTOR_STAMIN,
-	WNI_CFG_MAX_RX_AMPDU_FACTOR_STAMAX,
-	WNI_CFG_MAX_RX_AMPDU_FACTOR_STAMAX},
 	{WNI_CFG_SCAN_IN_POWERSAVE,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_LIM,