Browse Source

qcacld-3.0: Remove obsoleted INI called gFixedRate

Latest driver is not using "gFixedRate" INI anymore and this INI
is not doing any meaningful work, so remove it.

Change-Id: Icf7ef052a722f25c4338dd8086b14ce01c6176d8
CRs-Fixed: 2201799
Krunal Soni 7 years ago
parent
commit
e608a27cb8

+ 0 - 24
core/hdd/inc/wlan_hdd_cfg.h

@@ -350,29 +350,6 @@ enum hdd_dot11_mode {
 #define CFG_CHANNEL_BONDING_MODE_MAX           WNI_CFG_CHANNEL_BONDING_MODE_STAMAX
 #define CFG_CHANNEL_BONDING_MODE_DEFAULT       WNI_CFG_CHANNEL_BONDING_MODE_STADEF
 
-/*
- * <ini>
- * gFixedRate - It will provide fixed rate
- * @Min: 0
- * @Max: 44
- * @Default: 0
- *
- * This ini is used to set default fixed rate
- *
- * Related: None
- *
- * Supported Feature: STA
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-
-#define CFG_FIXED_RATE_NAME                    "gFixedRate"
-#define CFG_FIXED_RATE_MIN                     WNI_CFG_FIXED_RATE_STAMIN
-#define CFG_FIXED_RATE_MAX                     WNI_CFG_FIXED_RATE_STAMAX
-#define CFG_FIXED_RATE_DEFAULT                 WNI_CFG_FIXED_RATE_STADEF
-
 /*
  * <ini>
  * gShortGI20Mhz - Short Guard Interval for HT20
@@ -14444,7 +14421,6 @@ struct hdd_config {
 	bool override_ht20_40_24g;
 	uint32_t nChannelBondingMode5GHz;
 	uint32_t MaxRxAmpduFactor;
-	uint16_t TxRate;
 	uint32_t ShortGI20MhzEnable;
 	uint32_t ScanResultAgeCount;
 	uint8_t nRssiCatGap;

+ 0 - 14
core/hdd/src/wlan_hdd_cfg.c

@@ -510,13 +510,6 @@ struct reg_table_entry g_registry_table[] = {
 		     CFG_HT_MPDU_DENSITY_MIN,
 		     CFG_HT_MPDU_DENSITY_MAX),
 
-	REG_VARIABLE(CFG_FIXED_RATE_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, TxRate,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
-		     CFG_FIXED_RATE_DEFAULT,
-		     CFG_FIXED_RATE_MIN,
-		     CFG_FIXED_RATE_MAX),
-
 	REG_VARIABLE(CFG_SHORT_GI_20MHZ_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, ShortGI20MhzEnable,
 		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -8173,12 +8166,6 @@ bool hdd_update_config_cfg(struct hdd_context *hdd_ctx)
 		hdd_err("Couldn't set HE CAP in cfg");
 	}
 
-	if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_FIXED_RATE, config->TxRate)
-			    == QDF_STATUS_E_FAILURE) {
-		status = false;
-		hdd_err("Couldn't pass on WNI_CFG_FIXED_RATE to CFG");
-	}
-
 	if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_MAX_RX_AMPDU_FACTOR,
 			    config->MaxRxAmpduFactor) ==
 			QDF_STATUS_E_FAILURE) {
@@ -8913,7 +8900,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
 		smeConfig->csrConfig.channelBondingMode5GHz =
 			pConfig->nChannelBondingMode5GHz;
 	}
-	smeConfig->csrConfig.TxRate = pConfig->TxRate;
 	smeConfig->csrConfig.nScanResultAgeCount = pConfig->ScanResultAgeCount;
 	smeConfig->csrConfig.AdHocChannel24 = pConfig->OperatingChannel;
 	smeConfig->csrConfig.fSupplicantCountryCodeHasPriority =

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

@@ -75,7 +75,6 @@ enum {
 	WNI_CFG_VALID_CHANNEL_LIST,
 	WNI_CFG_CURRENT_CHANNEL,
 	WNI_CFG_DEFAULT_RATE_INDEX_24GHZ,
-	WNI_CFG_FIXED_RATE,
 	WNI_CFG_APSD_ENABLED,
 	WNI_CFG_SHARED_KEY_AUTH_ENABLE,
 	WNI_CFG_OPEN_SYSTEM_AUTH_ENABLE,

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

@@ -84,7 +84,6 @@ const char *cfg_get_string(uint16_t cfg_id)
 	CASE_RETURN_STRING(WNI_CFG_VALID_CHANNEL_LIST);
 	CASE_RETURN_STRING(WNI_CFG_CURRENT_CHANNEL);
 	CASE_RETURN_STRING(WNI_CFG_DEFAULT_RATE_INDEX_24GHZ);
-	CASE_RETURN_STRING(WNI_CFG_FIXED_RATE);
 	CASE_RETURN_STRING(WNI_CFG_APSD_ENABLED);
 	CASE_RETURN_STRING(WNI_CFG_SHARED_KEY_AUTH_ENABLE);
 	CASE_RETURN_STRING(WNI_CFG_OPEN_SYSTEM_AUTH_ENABLE);

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

@@ -231,11 +231,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STAMIN,
 	WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STAMAX,
 	WNI_CFG_DEFAULT_RATE_INDEX_24GHZ_STADEF},
-	{WNI_CFG_FIXED_RATE,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_FIXED_RATE_STAMIN,
-	WNI_CFG_FIXED_RATE_STAMAX,
-	WNI_CFG_FIXED_RATE_STADEF},
 	{WNI_CFG_APSD_ENABLED,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_APSD_ENABLED_STAMIN,

+ 0 - 1
core/sme/inc/csr_api.h

@@ -1127,7 +1127,6 @@ typedef struct tagCsrConfigParam {
 	uint32_t HeartbeatThresh24;
 	eCsrCBChoice cbChoice;
 	enum band_info bandCapability;     /* indicate hw capability */
-	uint16_t TxRate;
 	eCsrRoamWmmUserModeType WMMSupportMode;
 	bool Is11eSupportEnabled;
 	bool Is11dSupportEnabled;

+ 0 - 1
core/sme/inc/csr_internal.h

@@ -449,7 +449,6 @@ struct csr_config {
 	bool fenableMCCMode;
 	bool mcc_rts_cts_prot_enable;
 	bool mcc_bcast_prob_resp_enable;
-	uint16_t TxRate;
 	uint8_t fAllowMCCGODiffBI;
 	uint8_t AdHocChannel24;
 	uint8_t AdHocChannel5G;

+ 0 - 3
core/sme/src/csr/csr_api_roam.c

@@ -1472,7 +1472,6 @@ static void init_config_param(tpAniSirGlobal pMac)
 	pMac->roam.configParam.shortSlotTime = true;
 	pMac->roam.configParam.WMMSupportMode = eCsrRoamWmmAuto;
 	pMac->roam.configParam.ProprietaryRatesEnabled = true;
-	pMac->roam.configParam.TxRate = eCSR_TX_RATE_AUTO;
 	for (i = 0; i < CSR_NUM_RSSI_CAT; i++)
 		pMac->roam.configParam.BssPreferValue[i] = i;
 	csr_assign_rssi_for_category(pMac, CSR_BEST_RSSI_VALUE,
@@ -2586,7 +2585,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac,
 			pParam->HeartbeatThresh50;
 		pMac->roam.configParam.ProprietaryRatesEnabled =
 			pParam->ProprietaryRatesEnabled;
-		pMac->roam.configParam.TxRate = pParam->TxRate;
 		pMac->roam.configParam.AdHocChannel24 = pParam->AdHocChannel24;
 		pMac->roam.configParam.AdHocChannel5G = pParam->AdHocChannel5G;
 		pMac->roam.configParam.bandCapability = pParam->bandCapability;
@@ -3121,7 +3119,6 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam)
 	pParam->HeartbeatThresh24 = cfg_params->HeartbeatThresh24;
 	pParam->HeartbeatThresh50 = cfg_params->HeartbeatThresh50;
 	pParam->ProprietaryRatesEnabled = cfg_params->ProprietaryRatesEnabled;
-	pParam->TxRate = cfg_params->TxRate;
 	pParam->AdHocChannel24 = cfg_params->AdHocChannel24;
 	pParam->AdHocChannel5G = cfg_params->AdHocChannel5G;
 	pParam->bandCapability = cfg_params->bandCapability;