Browse Source

qcacld-3.0: (PART-3) Remove obsoleted enums in SME module

Remove some of the obsoleted enums and structure's members
in SME module

Change-Id: Ia453fcd2ba41a939964b6e481195c6bc64de6ab6
CRs-Fixed: 2201799
Krunal Soni 7 years ago
parent
commit
01507bd566

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

@@ -8971,7 +8971,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
 		smeConfig->csrConfig.Is11hSupportEnabled =
 			pConfig->Is11hSupportEnabled;
 	}
-	smeConfig->csrConfig.cbChoice = 0;
 	smeConfig->csrConfig.eBand = pConfig->nBandCapability;
 	smeConfig->csrConfig.nTxPowerCap = pConfig->nTxPowerCap;
 	smeConfig->csrConfig.allow_tpc_from_ap = pConfig->allow_tpc_from_ap;

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

@@ -670,34 +670,6 @@ typedef enum eCSR_MEDIUM_ACCESS {
 	eCSR_MEDIUM_ACCESS_11e_HCF = eCSR_MEDIUM_ACCESS_HCF,
 } eCsrMediaAccessType;
 
-typedef enum {
-	eCSR_TX_RATE_AUTO    = 0,  /* use rate adaption to determine Tx rate. */
-	eCSR_TX_RATE_1Mbps   = 0x00000001,
-	eCSR_TX_RATE_2Mbps   = 0x00000002,
-	eCSR_TX_RATE_5_5Mbps = 0x00000004,
-	eCSR_TX_RATE_6Mbps   = 0x00000008,
-	eCSR_TX_RATE_9Mbps   = 0x00000010,
-	eCSR_TX_RATE_11Mbps  = 0x00000020,
-	eCSR_TX_RATE_12Mbps  = 0x00000040,
-	eCSR_TX_RATE_18Mbps  = 0x00000080,
-	eCSR_TX_RATE_24Mbps  = 0x00000100,
-	eCSR_TX_RATE_36Mbps  = 0x00000200,
-	eCSR_TX_RATE_42Mbps  = 0x00000400,
-	eCSR_TX_RATE_48Mbps  = 0x00000800,
-	eCSR_TX_RATE_54Mbps  = 0x00001000,
-	eCSR_TX_RATE_72Mbps  = 0x00002000,
-	eCSR_TX_RATE_84Mbps  = 0x00004000,
-	eCSR_TX_RATE_96Mbps  = 0x00008000,
-	eCSR_TX_RATE_108Mbps = 0x00010000,
-	eCSR_TX_RATE_126Mbps = 0x00020000,
-	eCSR_TX_RATE_144Mbps = 0x00040000,
-	eCSR_TX_RATE_168Mbps = 0x00080000,
-	eCSR_TX_RATE_192Mbps = 0x00100000,
-	eCSR_TX_RATE_216Mbps = 0x00200000,
-	eCSR_TX_RATE_240Mbps = 0x00400000,
-
-} eCsrExposedTxRate;
-
 typedef enum {
 	eCSR_OPERATING_CHANNEL_ALL = 0,
 	eCSR_OPERATING_CHANNEL_AUTO = eCSR_OPERATING_CHANNEL_ALL,
@@ -711,14 +683,6 @@ typedef enum {
 	eCSR_DOT11_FRAG_THRESH_DEFAULT = 2000
 } eCsrDot11FragThresh;
 
-/* for channel bonding for ibss */
-typedef enum {
-	eCSR_CB_OFF = 0,
-	eCSR_CB_AUTO = 1,
-	eCSR_CB_DOWN = 2,
-	eCSR_CB_UP = 3,
-} eCsrCBChoice;
-
 /*
  * For channel bonding, the channel number gap is 4, either up or down.
  * For both 11a and 11g mode.
@@ -1125,7 +1089,6 @@ typedef struct tagCsrConfigParam {
 	uint32_t RTSThreshold;
 	uint32_t HeartbeatThresh50;
 	uint32_t HeartbeatThresh24;
-	eCsrCBChoice cbChoice;
 	enum band_info bandCapability;     /* indicate hw capability */
 	eCsrRoamWmmUserModeType WMMSupportMode;
 	bool Is11eSupportEnabled;

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

@@ -267,9 +267,6 @@ struct bss_config_param {
 	uint32_t uDeferThresh;
 	enum csr_cfgdot11mode uCfgDot11Mode;
 	enum band_info eBand;
-	uint8_t standardRate[CSR_DOT11_SUPPORTED_RATES_MAX];
-	uint8_t extendedRate[CSR_DOT11_EXTENDED_SUPPORTED_RATES_MAX];
-	eCsrExposedTxRate txRate;
 	tAniAuthType authType;
 	eCsrEncryptionType encType;
 	uint32_t uShortSlotTime;
@@ -437,7 +434,6 @@ struct csr_config {
 	enum band_info eBand;
 	uint32_t HeartbeatThresh50;
 	uint32_t HeartbeatThresh24;
-	eCsrCBChoice cbChoice;
 	enum band_info bandCapability;        /* indicate hw capability */
 	eCsrRoamWmmUserModeType WMMSupportMode;
 	bool Is11eSupportEnabled;

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

@@ -2588,7 +2588,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac,
 		pMac->roam.configParam.AdHocChannel24 = pParam->AdHocChannel24;
 		pMac->roam.configParam.AdHocChannel5G = pParam->AdHocChannel5G;
 		pMac->roam.configParam.bandCapability = pParam->bandCapability;
-		pMac->roam.configParam.cbChoice = pParam->cbChoice;
 		pMac->roam.configParam.wep_tkip_in_he = pParam->wep_tkip_in_he;
 		pMac->roam.configParam.neighborRoamConfig.
 			delay_before_vdev_stop =
@@ -3122,7 +3121,6 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam)
 	pParam->AdHocChannel24 = cfg_params->AdHocChannel24;
 	pParam->AdHocChannel5G = cfg_params->AdHocChannel5G;
 	pParam->bandCapability = cfg_params->bandCapability;
-	pParam->cbChoice = cfg_params->cbChoice;
 	pParam->nActiveMaxChnTime = cfg_params->nActiveMaxChnTime;
 	pParam->nActiveMinChnTime = cfg_params->nActiveMinChnTime;
 	pParam->nPassiveMaxChnTime = cfg_params->nPassiveMaxChnTime;