qcacld-3.0: Remove unused functions and structures from CSR

Remove unused functions and structures from CSR.

Change-Id: I0441a74423294cdbe11a906700147fd5cbaad75b
CRs-Fixed: 2989123

core/hdd/src/wlan_hdd_cfg80211.c

@@ -18551,7 +18551,8 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy,
 
 	memset(&params, 0, sizeof(params));
 
-	if (CSR_MAX_NUM_KEY <= key_index) {
+	if (key_index >= (WLAN_CRYPTO_MAXKEYIDX + WLAN_CRYPTO_MAXIGTKKEYIDX +
+			  WLAN_CRYPTO_MAXBIGTKKEYIDX)) {
 		hdd_err("Invalid key index: %d", key_index);
 		return -EINVAL;
 	}
@@ -18724,7 +18725,8 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy,
 		  qdf_opmode_str(adapter->device_mode),
 		  adapter->device_mode, key_index);
 
-	if (CSR_MAX_NUM_KEY <= key_index) {
+	if (key_index >= (WLAN_CRYPTO_MAXKEYIDX + WLAN_CRYPTO_MAXIGTKKEYIDX +
+			  WLAN_CRYPTO_MAXBIGTKKEYIDX)) {
 		hdd_err("Invalid key index: %d", key_index);
 		return -EINVAL;
 	}

core/sme/inc/csr_api.h

@@ -182,25 +182,6 @@ typedef enum {
 } eIniChanBondState;
 
 #define CSR_RSN_MAX_PMK_LEN         48
-#define CSR_MAX_PMKID_ALLOWED       32
-#define CSR_TKIP_KEY_LEN            32
-#define CSR_AES_KEY_LEN             16
-#define CSR_AES_GCMP_KEY_LEN        16
-#define CSR_AES_GCMP_256_KEY_LEN    32
-#define CSR_AES_GMAC_128_KEY_LEN    16
-#define CSR_AES_GMAC_256_KEY_LEN    32
-#define CSR_MAX_TX_POWER        (WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMAX)
-#ifdef FEATURE_WLAN_WAPI
-#define CSR_WAPI_BKID_SIZE          16
-#define CSR_MAX_BKID_ALLOWED        16
-#define CSR_WAPI_KEY_LEN            32
-#define CSR_MAX_KEY_LEN         (CSR_WAPI_KEY_LEN) /* longest one is for WAPI */
-#else
-#define CSR_MAX_KEY_LEN         (CSR_TKIP_KEY_LEN) /* longest one is for TKIP */
-#endif /* FEATURE_WLAN_WAPI */
-#ifdef FEATURE_WLAN_ESE
-#define CSR_KRK_KEY_LEN             16
-#endif
 
 typedef struct tagCsrChannelInfo {
 	uint8_t numOfChannels;
@@ -243,13 +224,6 @@ typedef struct tagCsrScanResultInfo {
 	struct bss_description BssDescriptor;
 } tCsrScanResultInfo;
 
-typedef struct tagCsrEncryptionList {
-
-	uint32_t numEntries;
-	eCsrEncryptionType encryptionType[eCSR_NUM_OF_ENCRYPT_TYPE];
-
-} tCsrEncryptionList, *tpCsrEncryptionList;
-
 typedef struct tagCsrAuthList {
 	uint32_t numEntries;
 	enum csr_akm_type authType[eCSR_NUM_OF_SUPPORT_AUTH_TYPE];
@@ -428,42 +402,6 @@ typedef enum {
 	eCSR_OPERATING_CHANNEL_ANY = eCSR_OPERATING_CHANNEL_ALL,
 } eOperationChannel;
 
-/*
- * For channel bonding, the channel number gap is 4, either up or down.
- * For both 11a and 11g mode.
- */
-#define CSR_CB_CHANNEL_GAP 4
-/* Considering 5 MHz Channel BW */
-#define CSR_CB_CENTER_CHANNEL_OFFSET    10
-#define CSR_SEC_CHANNEL_OFFSET    20
-
-
-/* WEP keysize (in bits) */
-typedef enum {
-	/* 40 bit key + 24bit IV = 64bit WEP */
-	eCSR_SECURITY_WEP_KEYSIZE_40 = 40,
-	/* 104bit key + 24bit IV = 128bit WEP */
-	eCSR_SECURITY_WEP_KEYSIZE_104 = 104,
-	eCSR_SECURITY_WEP_KEYSIZE_MIN = eCSR_SECURITY_WEP_KEYSIZE_40,
-	eCSR_SECURITY_WEP_KEYSIZE_MAX = eCSR_SECURITY_WEP_KEYSIZE_104,
-	eCSR_SECURITY_WEP_KEYSIZE_MAX_BYTES =
-		(eCSR_SECURITY_WEP_KEYSIZE_MAX / 8),
-} eCsrWEPKeySize;
-
-/* Possible values for the WEP static key ID */
-typedef enum {
-
-	eCSR_SECURITY_WEP_STATIC_KEY_ID_MIN = 0,
-	eCSR_SECURITY_WEP_STATIC_KEY_ID_MAX = 3,
-	eCSR_SECURITY_WEP_STATIC_KEY_ID_DEFAULT = 0,
-
-	eCSR_SECURITY_WEP_STATIC_KEY_ID_INVALID = -1,
-
-} eCsrWEPStaticKeyID;
-
-/* Two extra key indicies are used for the IGTK, two for BIGTK */
-#define CSR_MAX_NUM_KEY     (eCSR_SECURITY_WEP_STATIC_KEY_ID_MAX + 2 + 1 + 2)
-
 typedef enum {
 	/*
 	 * Roaming because HDD requested for reassoc by changing one of the
@@ -492,24 +430,6 @@ typedef enum {
 
 } eCsrRoamWmmUserModeType;
 
-#ifdef FEATURE_WLAN_WAPI
-typedef struct tagBkidCandidateInfo {
-	struct qdf_mac_addr BSSID;
-	bool preAuthSupported;
-} tBkidCandidateInfo;
-
-typedef struct tagBkidCacheInfo {
-	struct qdf_mac_addr BSSID;
-	uint8_t BKID[CSR_WAPI_BKID_SIZE];
-} tBkidCacheInfo;
-#endif /* FEATURE_WLAN_WAPI */
-
-typedef struct tagCsrKeys {
-	/* Also use to indicate whether the key index is set */
-	uint8_t KeyLength[CSR_MAX_NUM_KEY];
-	uint8_t KeyMaterial[CSR_MAX_NUM_KEY][CSR_MAX_KEY_LEN];
-} tCsrKeys;
-
 /*
  * Following fields might need modification dynamically once STA is up
  * & running & this'd trigger reassoc.

core/sme/inc/csr_internal.h

@@ -35,8 +35,6 @@
 #include "sir_types.h"
 #include "wlan_mlme_public_struct.h"
 
-#define CSR_ROAM_SCAN_CHANNEL_SWITCH_TIME        3
-
 /* No of sessions to be supported, and a session is for Infra, BT-AMP */
 #define CSR_IS_SESSION_VALID(mac, sessionId) \
 	((sessionId) < WLAN_MAX_VDEVS && \
@@ -54,18 +52,11 @@
 	  ((((mac_ctx)->mlme_cfg->lfr.roaming_dfs_channel) != \
 	    ROAMING_DFS_CHANNEL_DISABLED) ? true : false) \
 	)
-#define CSR_IS_SELECT_5GHZ_MARGIN(mac) \
-	( \
-	  (((mac)->roam.configParam.nSelect5GHzMargin) ? true : false) \
-	)
 #define CSR_IS_ROAM_PREFER_5GHZ(mac)	\
 	( \
 	  ((mac)->mlme_cfg->lfr.roam_prefer_5ghz) \
 	)
-#define CSR_IS_FASTROAM_IN_CONCURRENCY_INI_FEATURE_ENABLED(mac) \
-	( \
-	  ((mac)->mlme_cfg->lfr.enable_fast_roam_in_concurrency) \
-	)
+
 #define CSR_IS_CHANNEL_24GHZ(chnNum) \
 	(((chnNum) > 0) && ((chnNum) <= 14))
 
@@ -374,16 +365,6 @@ struct csr_roamstruct {
 #define CSR_IS_ROAM_SUBSTATE_WAITFORKEY(mac, sessionId) \
 		CSR_IS_ROAM_SUBSTATE((mac), \
 			eCSR_ROAM_SUBSTATE_WAIT_FOR_KEY, sessionId)
-#define CSR_IS_PHY_MODE_B_ONLY(mac) \
-	((eCSR_DOT11_MODE_11b == (mac)->roam.configParam.phyMode) || \
-	 (eCSR_DOT11_MODE_11b_ONLY == (mac)->roam.configParam.phyMode))
-
-#define CSR_IS_PHY_MODE_G_ONLY(mac) \
-	(eCSR_DOT11_MODE_11g == (mac)->roam.configParam.phyMode \
-		|| eCSR_DOT11_MODE_11g_ONLY == (mac)->roam.configParam.phyMode)
-
-#define CSR_IS_PHY_MODE_A_ONLY(mac) \
-	(eCSR_DOT11_MODE_11a == (mac)->roam.configParam.phyMode)
 
 #define CSR_IS_PHY_MODE_DUAL_BAND(phyMode) \
 	((eCSR_DOT11_MODE_abg & (phyMode)) || \
@@ -393,16 +374,6 @@ struct csr_roamstruct {
 	 (eCSR_DOT11_MODE_11be & (phyMode)) || \
 	 (eCSR_DOT11_MODE_AUTO & (phyMode)))
 
-#define CSR_IS_PHY_MODE_11n(phy_mode) \
-	((eCSR_DOT11_MODE_11n == phy_mode) || \
-	 (eCSR_DOT11_MODE_11n_ONLY == phy_mode) || \
-	 (eCSR_DOT11_MODE_11ac == phy_mode) || \
-	 (eCSR_DOT11_MODE_11ac_ONLY == phy_mode))
-
-#define CSR_IS_PHY_MODE_11ac(phy_mode) \
-	((eCSR_DOT11_MODE_11ac == phy_mode) || \
-	 (eCSR_DOT11_MODE_11ac_ONLY == phy_mode))
-
 #define CSR_IS_DOT11_MODE_11N(dot11mode) \
 	((dot11mode == eCSR_CFG_DOT11_MODE_AUTO) || \
 	 (dot11mode == eCSR_CFG_DOT11_MODE_11N) || \
@@ -531,7 +502,6 @@ bool csr_is_conn_state_disconnected_wds(struct mac_context *mac,
 bool csr_is_any_session_in_connect_state(struct mac_context *mac);
 bool csr_is_all_session_disconnected(struct mac_context *mac);
 
-bool csr_is_concurrent_session_running(struct mac_context *mac);
 bool csr_is_infra_ap_started(struct mac_context *mac);
 bool csr_is_conn_state_connected_infra_ap(struct mac_context *mac,
 		uint32_t sessionId);
@@ -549,13 +519,6 @@ QDF_STATUS csr_start(struct mac_context *mac);
 QDF_STATUS csr_stop(struct mac_context *mac);
 QDF_STATUS csr_ready(struct mac_context *mac);
 
-#ifdef FEATURE_WLAN_WAPI
-uint8_t csr_construct_wapi_ie(struct mac_context *mac, uint32_t sessionId,
-		struct csr_roam_profile *pProfile,
-		struct bss_description *pSirBssDesc,
-		tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe);
-#endif /* FEATURE_WLAN_WAPI */
-
 /**
  * csr_get_concurrent_operation_freq() - To get concurrent operating freq
  * @mac_ctx: Pointer to mac context
@@ -603,11 +566,6 @@ QDF_STATUS csr_get_tsm_stats(struct mac_context *mac,
 		void *pContext, uint8_t tid);
 #endif
 
-/* Returns whether "Legacy Fast Roaming" is enabled...or not */
-bool csr_roam_is_fast_roam_enabled(struct mac_context *mac,  uint8_t vdev_id);
-bool csr_roam_is_roam_offload_scan_enabled(
-	struct mac_context *mac);
-
 /**
  * csr_roam_channel_change_req() - Post channel change request to LIM
  * @mac: mac context
@@ -642,8 +600,6 @@ QDF_STATUS
 csr_roam_update_add_ies(struct mac_context *mac,
 		tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType);
 
-QDF_STATUS csr_get_channels_and_power(struct mac_context *mac);
-
 bool csr_nonscan_active_ll_remove_entry(
 			struct mac_context *mac_ctx,
 			tListElem *pEntryToRemove, bool inter_locked);
@@ -657,28 +613,6 @@ tListElem *csr_nonscan_pending_ll_next(
 			struct mac_context *mac_ctx,
 		tListElem *entry, bool inter_locked);
 
-/**
- * csr_purge_vdev_pending_ser_cmd_list() - purge all scan and non-scan
- * pending cmds for the vdev id
- * @mac_ctx: pointer to global MAC context
- * @vdev_id : vdev id for which the pending cmds need to be purged
- *
- * Return : none
- */
-void csr_purge_vdev_pending_ser_cmd_list(struct mac_context *mac_ctx,
-					 uint32_t vdev_id);
-
-/**
- * csr_purge_vdev_all_scan_ser_cmd_list() - purge all scan active and pending
- * cmds for the vdev id
- * @mac_ctx: pointer to global MAC context
- * @vdev_id : vdev id for which cmds need to be purged
- *
- * Return : none
- */
-void csr_purge_vdev_all_scan_ser_cmd_list(struct mac_context *mac_ctx,
-					  uint32_t vdev_id);
-
 /**
  * csr_purge_pdev_all_ser_cmd_list() - purge all scan and non-scan
  * active and pending cmds for all vdevs in pdev
@@ -688,9 +622,6 @@ void csr_purge_vdev_all_scan_ser_cmd_list(struct mac_context *mac_ctx,
  */
 void csr_purge_pdev_all_ser_cmd_list(struct mac_context *mac_ctx);
 
-bool csr_wait_for_connection_update(struct mac_context *mac,
-		bool do_release_reacquire_lock);
-
 void csr_roam_substate_change(
 			struct mac_context *mac, enum csr_roam_substate
 					NewSubstate, uint32_t sessionId);

core/sme/inc/csr_support.h

@@ -30,133 +30,16 @@
 
 #ifdef FEATURE_WLAN_WAPI
 #define CSR_WAPI_OUI_SIZE              (4)
-#define CSR_WAPI_VERSION_SUPPORTED     (1)
-#define CSR_WAPI_MAX_AUTH_SUITES       (2)
-#define CSR_WAPI_MAX_CYPHERS           (5)
-#define CSR_WAPI_MAX_UNICAST_CYPHERS   (5)
-#define CSR_WAPI_MAX_MULTICAST_CYPHERS (1)
 #endif /* FEATURE_WLAN_WAPI */
 
 #define CSR_RSN_OUI_SIZE              (4)
-#define CSR_RSN_VERSION_SUPPORTED     (1)
-#define CSR_RSN_MAX_AUTH_SUITES       (5)
-#define CSR_RSN_MAX_CYPHERS           (5)
-#define CSR_RSN_MAX_UNICAST_CYPHERS   (5)
-#define CSR_RSN_MAX_MULTICAST_CYPHERS (1)
-
 #define CSR_WPA_OUI_SIZE              (4)
-#define CSR_WPA_VERSION_SUPPORTED     (1)
-#define CSR_WME_OUI_SIZE (4)
-#define CSR_WPA_MAX_AUTH_SUITES       (2)
-#define CSR_WPA_MAX_CYPHERS           (5)
-#define CSR_WPA_MAX_UNICAST_CYPHERS   (5)
-#define CSR_WPA_MAX_MULTICAST_CYPHERS (1)
-/* minimum size of the IE->length is the size of the Oui + Version. */
-#define CSR_WPA_IE_MIN_SIZE           (6)
-#define CSR_WPA_IE_MIN_SIZE_W_MULTICAST (HDD_WPA_IE_MIN_SIZE + HDD_WPA_OUI_SIZE)
-#define CSR_WPA_IE_MIN_SIZE_W_UNICAST   (HDD_WPA_IE_MIN_SIZE + \
-		HDD_WPA_OUI_SIZE + sizeof(pWpaIe->cUnicastCyphers))
 
 #define CSR_DOT11_SUPPORTED_RATES_MAX (12)
 #define CSR_DOT11_EXTENDED_SUPPORTED_RATES_MAX (8)
 
 #define CSR_DOT11_BASIC_RATE_MASK    WLAN_DOT11_BASIC_RATE_MASK
 
-/* NOTE these index are use as array index for csr_rsn_oui */
-#define CSR_OUI_USE_GROUP_CIPHER_INDEX 0x00
-#define CSR_OUI_WEP40_OR_1X_INDEX      0x01
-#define CSR_OUI_TKIP_OR_PSK_INDEX      0x02
-#define CSR_OUI_RESERVED_INDEX         0x03
-#define CSR_OUI_AES_INDEX              0x04
-#define CSR_OUI_WEP104_INDEX           0x05
-/* ENUM_FILS_SHA384 9 */
-/* ENUM_FILS_SHA384 10 */
-/* ENUM_FT_FILS_SHA256 11 */
-/* ENUM_FT_FILS_SHA384 12 */
-#define CSR_OUI_AES_GCMP_INDEX         0x0D
-#define CSR_OUI_AES_GCMP_256_INDEX     0x0E
-
-#ifdef FEATURE_WLAN_WAPI
-#define CSR_OUI_WAPI_RESERVED_INDEX    0x00
-#define CSR_OUI_WAPI_WAI_CERT_OR_SMS4_INDEX    0x01
-#define CSR_OUI_WAPI_WAI_PSK_INDEX     0x02
-/* max idx, should be last & highest */
-#define CSR_OUI_WAPI_WAI_MAX_INDEX     0x03
-#endif /* FEATURE_WLAN_WAPI */
-
-/* Generic Information Element Structure */
-typedef struct sDot11IEHeader {
-	uint8_t ElementID;
-	uint8_t Length;
-} qdf_packed tDot11IEHeader;
-
-typedef struct tagCsrWpaIe {
-	tDot11IEHeader IeHeader;
-	uint8_t Oui[CSR_WPA_OUI_SIZE];
-	uint16_t Version;
-	uint8_t MulticastOui[CSR_WPA_OUI_SIZE];
-	uint16_t cUnicastCyphers;
-	struct {
-		uint8_t Oui[CSR_WPA_OUI_SIZE];
-	} qdf_packed UnicastOui[1];
-} qdf_packed tCsrWpaIe;
-
-typedef struct tagCsrWpaAuthIe {
-	uint16_t cAuthenticationSuites;
-	struct {
-		uint8_t Oui[CSR_WPA_OUI_SIZE];
-	} qdf_packed AuthOui[1];
-} qdf_packed tCsrWpaAuthIe;
-
-typedef struct tagCsrRSNIe {
-	tDot11IEHeader IeHeader;
-	uint16_t Version;
-	uint8_t MulticastOui[CSR_RSN_OUI_SIZE];
-	uint16_t cUnicastCyphers;
-	struct {
-		uint8_t Oui[CSR_RSN_OUI_SIZE];
-	} qdf_packed UnicastOui[1];
-} qdf_packed tCsrRSNIe;
-
-typedef struct tagCsrRSNAuthIe {
-	uint16_t cAuthenticationSuites;
-	struct {
-		uint8_t Oui[CSR_RSN_OUI_SIZE];
-	} qdf_packed AuthOui[1];
-} qdf_packed tCsrRSNAuthIe;
-
-typedef struct tagCsrRSNPMKIe {
-	uint16_t cPMKIDs;
-	struct {
-		uint8_t PMKID[PMKID_LEN];
-	} qdf_packed PMKIDList[1];
-} qdf_packed tCsrRSNPMKIe;
-
-typedef struct tCsrIELenInfo {
-	uint8_t min;
-	uint8_t max;
-} qdf_packed tCsrIELenInfo;
-
-#ifdef FEATURE_WLAN_WAPI
-typedef struct tagCsrWapiIe {
-	tDot11IEHeader IeHeader;
-	uint16_t Version;
-	uint16_t cAuthenticationSuites;
-	struct {
-		uint8_t Oui[CSR_WAPI_OUI_SIZE];
-	} qdf_packed AuthOui[1];
-	uint16_t cUnicastCyphers;
-	struct {
-		uint8_t Oui[CSR_WAPI_OUI_SIZE];
-	} qdf_packed UnicastOui[1];
-	uint8_t MulticastOui[CSR_WAPI_OUI_SIZE];
-	struct {
-		uint16_t PreAuthSupported:1;
-		uint16_t Reserved:15;
-	} qdf_packed tCsrWapiCapabilities;
-} qdf_packed tCsrWapiIe;
-#endif /* FEATURE_WLAN_WAPI */
-
 /**
  * struct csr_timer_info - CSR-specific timer context
  * @mac: Global MAC context associated with the timer
@@ -167,38 +50,20 @@ struct csr_timer_info {
 	uint8_t vdev_id;
 };
 
-#define CSR_IS_11A_BSS(bss_desc)    (eSIR_11A_NW_TYPE == (bss_desc)->nwType)
-#define CSR_IS_BASIC_RATE(rate)     ((rate) & CSR_DOT11_BASIC_RATE_MASK)
 #define CSR_IS_QOS_BSS(pIes)  \
 		((pIes)->WMMParams.present || (pIes)->WMMInfoAp.present)
-#define CSR_IS_UAPSD_BSS(pIes) \
-	(((pIes)->WMMParams.present && \
-	 ((pIes)->WMMParams.qosInfo & SME_QOS_AP_SUPPORTS_APSD)) || \
-	 ((pIes)->WMMInfoAp.present && (pIes)->WMMInfoAp.uapsd))
 
 eCsrMediaAccessType
 csr_get_qos_from_bss_desc(struct mac_context *mac_ctx,
 			  struct bss_description *pSirBssDesc,
 			  tDot11fBeaconIEs *pIes);
 
-bool csr_is_nullssid(uint8_t *pBssSsid, uint8_t len);
-bool csr_is_infra_bss_desc(struct bss_description *pSirBssDesc);
-
-tSirResultCodes csr_get_de_auth_rsp_status_code(struct deauth_rsp *pSmeRsp);
 uint32_t csr_get_frag_thresh(struct mac_context *mac_ctx);
 uint32_t csr_get_rts_thresh(struct mac_context *mac_ctx);
 
-bool csr_rates_is_dot11_rate11a_supported_rate(uint8_t dot11Rate);
-tAniEdType csr_translate_encrypt_type_to_ed_type(
-		eCsrEncryptionType EncryptType);
-
 bool csr_is_bssid_match(struct qdf_mac_addr *pProfBssid,
 			struct qdf_mac_addr *BssBssid);
 enum bss_type csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype);
-/* Caller allocates memory for pIEStruct */
-QDF_STATUS csr_parse_bss_description_ies(struct mac_context *mac_ctx,
-					 struct bss_description *bss_desc,
-					 tDot11fBeaconIEs *pIEStruct);
 /*
  * This function will allocate memory for the parsed IEs to the caller.
  * Caller must free the memory. after it is done with the data only if

core/sme/src/csr/csr_api_roam.c

@@ -1437,19 +1437,6 @@ QDF_STATUS csr_get_tsm_stats(struct mac_context *mac,
 }
 #endif /* FEATURE_WLAN_ESE */
 
-/**
- * csr_roam_is_roam_offload_scan_enabled() - is roam offload enabled
- * @mac_ctx: Global MAC context
- *
- * Returns whether firmware based background scan is currently enabled or not.
- *
- * Return: true if roam offload scan enabled; false otherwise
- */
-bool csr_roam_is_roam_offload_scan_enabled(struct mac_context *mac_ctx)
-{
-	return mac_ctx->mlme_cfg->lfr.roam_scan_offload_enabled;
-}
-
 /* The funcns csr_convert_cb_ini_value_to_phy_cb_state and
  * csr_convert_phy_cb_state_to_ini_value have been introduced
  * to convert the ini value to the ENUM used in csr and MAC for CB state
@@ -2812,18 +2799,6 @@ bool csr_roam_is11r_assoc(struct mac_context *mac, uint8_t sessionId)
 	return config.bool_value;
 }
 
-bool csr_roam_is_fast_roam_enabled(struct mac_context *mac, uint8_t vdev_id)
-{
-	if (wlan_get_opmode_from_vdev_id(mac->pdev, vdev_id) != QDF_STA_MODE)
-		return false;
-
-	if (true == CSR_IS_FASTROAM_IN_CONCURRENCY_INI_FEATURE_ENABLED(mac))
-		return mac->mlme_cfg->lfr.lfr_enabled;
-	else
-		return mac->mlme_cfg->lfr.lfr_enabled &&
-			(!csr_is_concurrent_session_running(mac));
-}
-
 /**
  * csr_roam_process_results_default() - Process the result for start bss
  * @mac_ctx:          Global MAC Context
@@ -5315,11 +5290,6 @@ QDF_STATUS csr_get_cfg_valid_channels(struct mac_context *mac,
 	return QDF_STATUS_SUCCESS;
 }
 
-int8_t csr_get_cfg_max_tx_power(struct mac_context *mac, uint32_t ch_freq)
-{
-	return wlan_get_cfg_max_tx_power(mac->psoc, mac->pdev, ch_freq);
-}
-
 /**
  * csr_populate_basic_rates() - populates OFDM or CCK rates
  * @rates:         rate struct to populate
@@ -5640,7 +5610,7 @@ void csr_roam_prepare_bss_params(struct mac_context *mac, uint32_t sessionId,
 		return;
 	}
 
-	csr_roam_get_bss_start_parms(mac, sessionId, pProfile, 
+	csr_roam_get_bss_start_parms(mac, sessionId, pProfile,
 				     &pSession->bssParams,
 				     skip_hostapd_rate);
 	/* Use the first SSID */

core/sme/src/csr/csr_inside_api.h

@@ -29,19 +29,6 @@
 #include "cds_reg_service.h"
 #include "wlan_objmgr_vdev_obj.h"
 
-#ifdef QCA_WIFI_3_0_EMU
-#define CSR_ACTIVE_SCAN_LIST_CMD_TIMEOUT (1000*30*20)
-#else
-#define CSR_ACTIVE_SCAN_LIST_CMD_TIMEOUT (1000*30)
-#endif
-/* ***************************************************************************
- * The MAX BSSID Count should be lower than the command timeout value.
- * As in some case auth timeout can take upto 5 sec (in case of SAE auth) try
- * (command timeout/5000 - 1) candidates.
- * ***************************************************************************/
-#define CSR_MAX_BSSID_COUNT     (SME_ACTIVE_LIST_CMD_TIMEOUT_VALUE/5000) - 1
-#define CSR_CUSTOM_CONC_GO_BI    100
-extern uint8_t csr_wpa_oui[][CSR_WPA_OUI_SIZE];
 bool csr_is_supported_channel(struct mac_context *mac, uint32_t chan_freq);
 
 enum csr_roamcomplete_result {
@@ -175,8 +162,6 @@ QDF_STATUS csr_get_cfg_valid_channels(struct mac_context *mac,
 				      uint32_t *ch_freq_list,
 				      uint32_t *num_ch_freq);
 
-int8_t csr_get_cfg_max_tx_power(struct mac_context *mac, uint32_t ch_freq);
-
 /* to free memory allocated inside the profile structure */
 void csr_release_profile(struct mac_context *mac,
 			 struct csr_roam_profile *pProfile);
@@ -224,8 +209,6 @@ void csr_cleanup_vdev_session(struct mac_context *mac, uint8_t vdev_id);
 QDF_STATUS csr_roam_get_session_id_from_bssid(struct mac_context *mac,
 						struct qdf_mac_addr *bssid,
 					      uint32_t *pSessionId);
-enum csr_cfgdot11mode csr_find_best_phy_mode(struct mac_context *mac,
-							uint32_t phyMode);
 
 /*
  * csr_scan_get_result() - Return scan results based on filter
@@ -281,24 +264,6 @@ tCsrScanResultInfo *csr_scan_result_get_first(struct mac_context *mac,
 tCsrScanResultInfo *csr_scan_result_get_next(struct mac_context *mac,
 					     tScanResultHandle hScanResult);
 
-/*
- * csr_get_regulatory_domain_for_country() -
- * This function is to get the regulatory domain for a country.
- * This function must be called after CFG is downloaded and all the band/mode
- * setting already passed into CSR.
- *
- * pCountry - Caller allocated buffer with at least 3 bytes specifying the
- * country code
- * pDomainId - Caller allocated buffer to get the return domain ID upon
- * success return. Can be NULL.
- * source - the source of country information.
- * Return QDF_STATUS
- */
-QDF_STATUS csr_get_regulatory_domain_for_country(struct mac_context *mac,
-						 uint8_t *pCountry,
-						 v_REGDOMAIN_t *pDomainId,
-						 enum country_src source);
-
 /* some support functions */
 bool csr_is11h_supported(struct mac_context *mac);
 bool csr_is11e_supported(struct mac_context *mac);

core/sme/src/csr/csr_util.c

@@ -36,130 +36,6 @@
 #include "wlan_cm_roam_api.h"
 #include <../../core/src/wlan_cm_vdev_api.h>
 
-uint8_t csr_wpa_oui[][CSR_WPA_OUI_SIZE] = {
-	{0x00, 0x50, 0xf2, 0x00}
-	,
-	{0x00, 0x50, 0xf2, 0x01}
-	,
-	{0x00, 0x50, 0xf2, 0x02}
-	,
-	{0x00, 0x50, 0xf2, 0x03}
-	,
-	{0x00, 0x50, 0xf2, 0x04}
-	,
-	{0x00, 0x50, 0xf2, 0x05}
-	,
-#ifdef FEATURE_WLAN_ESE
-	{0x00, 0x40, 0x96, 0x00}
-	,                       /* CCKM */
-#endif /* FEATURE_WLAN_ESE */
-};
-
-#define FT_PSK_IDX   4
-#define FT_8021X_IDX 3
-
-/*
- * PLEASE DO NOT ADD THE #IFDEF IN BELOW TABLE,
- * IF STILL REQUIRE THEN PLEASE ADD NULL ENTRIES
- * OTHERWISE IT WILL BREAK OTHER LOWER
- * SECUIRTY MODES.
- */
-
-uint8_t csr_rsn_oui[][CSR_RSN_OUI_SIZE] = {
-	{0x00, 0x0F, 0xAC, 0x00}
-	,                       /* group cipher */
-	{0x00, 0x0F, 0xAC, 0x01}
-	,                       /* WEP-40 or RSN */
-	{0x00, 0x0F, 0xAC, 0x02}
-	,                       /* TKIP or RSN-PSK */
-	{0x00, 0x0F, 0xAC, 0x03}
-	,                       /* Reserved */
-	{0x00, 0x0F, 0xAC, 0x04}
-	,                       /* AES-CCMP */
-	{0x00, 0x0F, 0xAC, 0x05}
-	,                       /* WEP-104 */
-	{0x00, 0x40, 0x96, 0x00}
-	,                       /* CCKM */
-	{0x00, 0x0F, 0xAC, 0x06}
-	,                       /* BIP (encryption type) or
-				 * RSN-PSK-SHA256 (authentication type)
-				 */
-	/* RSN-8021X-SHA256 (authentication type) */
-	{0x00, 0x0F, 0xAC, 0x05},
-#ifdef WLAN_FEATURE_FILS_SK
-#define ENUM_FILS_SHA256 9
-	/* FILS SHA256 */
-	{0x00, 0x0F, 0xAC, 0x0E},
-#define ENUM_FILS_SHA384 10
-	/* FILS SHA384 */
-	{0x00, 0x0F, 0xAC, 0x0F},
-#define ENUM_FT_FILS_SHA256 11
-	/* FILS FT SHA256 */
-	{0x00, 0x0F, 0xAC, 0x10},
-#define ENUM_FT_FILS_SHA384 12
-	/* FILS FT SHA384 */
-	{0x00, 0x0F, 0xAC, 0x11},
-#else
-	{0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00},
-#endif
-	/* AES GCMP */
-	{0x00, 0x0F, 0xAC, 0x08},
-	/* AES GCMP-256 */
-	{0x00, 0x0F, 0xAC, 0x09},
-#define ENUM_DPP_RSN 15
-	/* DPP RSN */
-	{0x50, 0x6F, 0x9A, 0x02},
-#define ENUM_OWE 16
-	/* OWE https://tools.ietf.org/html/rfc8110 */
-	{0x00, 0x0F, 0xAC, 0x12},
-#define ENUM_SUITEB_EAP256 17
-	{0x00, 0x0F, 0xAC, 0x0B},
-#define ENUM_SUITEB_EAP384 18
-	{0x00, 0x0F, 0xAC, 0x0C},
-
-#ifdef WLAN_FEATURE_SAE
-#define ENUM_SAE 19
-	/* SAE */
-	{0x00, 0x0F, 0xAC, 0x08},
-#define ENUM_FT_SAE 20
-	/* FT SAE */
-	{0x00, 0x0F, 0xAC, 0x09},
-#else
-	{0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00},
-#endif
-#define ENUM_OSEN 21
-	/* OSEN RSN */
-	{0x50, 0x6F, 0x9A, 0x01},
-#define ENUM_FT_SUITEB_SHA384 22
-	/* FT Suite-B SHA384 */
-	{0x00, 0x0F, 0xAC, 0x0D},
-
-	/* define new oui here, update #define CSR_OUI_***_INDEX  */
-};
-
-#ifdef FEATURE_WLAN_WAPI
-uint8_t csr_wapi_oui[][CSR_WAPI_OUI_SIZE] = {
-	{0x00, 0x14, 0x72, 0x00}
-	,                       /* Reserved */
-	{0x00, 0x14, 0x72, 0x01}
-	,                       /* WAI certificate or SMS4 */
-	{0x00, 0x14, 0x72, 0x02} /* WAI PSK */
-};
-#endif /* FEATURE_WLAN_WAPI */
-
-uint8_t csr_group_mgmt_oui[][CSR_RSN_OUI_SIZE] = {
-#define ENUM_CMAC 0
-	{0x00, 0x0F, 0xAC, 0x06},
-#define ENUM_GMAC_128 1
-	{0x00, 0x0F, 0xAC, 0x0B},
-#define ENUM_GMAC_256 2
-	{0x00, 0x0F, 0xAC, 0x0C},
-};
-
 #define CASE_RETURN_STR(n) {\
 	case (n): return (# n);\
 }
@@ -295,20 +171,6 @@ const char *csr_phy_mode_str(eCsrPhyMode phy_mode)
 	}
 }
 
-void csr_purge_vdev_pending_ser_cmd_list(struct mac_context *mac_ctx,
-					 uint32_t vdev_id)
-{
-	wlan_serialization_purge_all_pending_cmd_by_vdev_id(mac_ctx->pdev,
-							    vdev_id);
-}
-
-void csr_purge_vdev_all_scan_ser_cmd_list(struct mac_context *mac_ctx,
-					  uint32_t vdev_id)
-{
-	wlan_serialization_purge_all_scan_cmd_by_vdev_id(mac_ctx->pdev,
-							 vdev_id);
-}
-
 void csr_purge_pdev_all_ser_cmd_list(struct mac_context *mac_ctx)
 {
 	wlan_serialization_purge_all_pdev_cmd(mac_ctx->pdev);
@@ -916,25 +778,6 @@ bool csr_is_all_session_disconnected(struct mac_context *mac)
 	return fRc;
 }
 
-bool csr_is_concurrent_session_running(struct mac_context *mac)
-{
-	uint8_t vdev_id, noOfCocurrentSession = 0;
-	bool fRc = false;
-
-	for (vdev_id = 0; vdev_id < WLAN_MAX_VDEVS; vdev_id++) {
-		if (!CSR_IS_SESSION_VALID(mac, vdev_id))
-			continue;
-		if (csr_is_conn_state_connected_infra_ap(mac, vdev_id) ||
-		    cm_is_vdevid_connected(mac->pdev, vdev_id))
-			++noOfCocurrentSession;
-	}
-
-	/* More than one session is Up and Running */
-	if (noOfCocurrentSession > 1)
-		fRc = true;
-	return fRc;
-}
-
 bool csr_is_infra_ap_started(struct mac_context *mac)
 {
 	uint32_t sessionId;
@@ -966,13 +809,6 @@ bool csr_is_conn_state_disconnected(struct mac_context *mac, uint8_t vdev_id)
 	       mac->roam.roamSession[vdev_id].connectState;
 }
 
-bool csr_is_infra_bss_desc(struct bss_description *pSirBssDesc)
-{
-	tSirMacCapabilityInfo dot11Caps = csr_get_bss_capabilities(pSirBssDesc);
-
-	return (bool) dot11Caps.ess;
-}
-
 static bool csr_is_qos_bss_desc(struct bss_description *pSirBssDesc)
 {
 	tSirMacCapabilityInfo dot11Caps = csr_get_bss_capabilities(pSirBssDesc);
@@ -1073,14 +909,6 @@ csr_get_qos_from_bss_desc(struct mac_context *mac_ctx,
 	return qosType;
 }
 
-/* Caller allocates memory for pIEStruct */
-QDF_STATUS csr_parse_bss_description_ies(struct mac_context *mac_ctx,
-					 struct bss_description *bss_desc,
-					 tDot11fBeaconIEs *pIEStruct)
-{
-	return wlan_parse_bss_description_ies(mac_ctx, bss_desc, pIEStruct);
-}
-
 /* This function will allocate memory for the parsed IEs to the caller.
  * Caller must free the memory after it is done with the data only if
  * this function succeeds
@@ -1093,44 +921,6 @@ QDF_STATUS csr_get_parsed_bss_description_ies(struct mac_context *mac_ctx,
 						   ppIEStruct);
 }
 
-bool csr_is_nullssid(uint8_t *pBssSsid, uint8_t len)
-{
-	bool fNullSsid = false;
-
-	uint32_t SsidLength;
-	uint8_t *pSsidStr;
-
-	do {
-		if (0 == len) {
-			fNullSsid = true;
-			break;
-		}
-		/* Consider 0 or space for hidden SSID */
-		if (0 == pBssSsid[0]) {
-			fNullSsid = true;
-			break;
-		}
-
-		SsidLength = len;
-		pSsidStr = pBssSsid;
-
-		while (SsidLength) {
-			if (*pSsidStr)
-				break;
-
-			pSsidStr++;
-			SsidLength--;
-		}
-
-		if (0 == SsidLength) {
-			fNullSsid = true;
-			break;
-		}
-	} while (0);
-
-	return fNullSsid;
-}
-
 uint32_t csr_get_frag_thresh(struct mac_context *mac_ctx)
 {
 	return mac_ctx->mlme_cfg->threshold.frag_threshold;
@@ -1356,84 +1146,6 @@ bool csr_is_pmkid_found_for_peer(struct mac_context *mac,
 	return false;
 }
 
-bool csr_rates_is_dot11_rate11a_supported_rate(uint8_t dot11Rate)
-{
-	bool fSupported = false;
-	uint16_t nonBasicRate =
-		(uint16_t) (BITS_OFF(dot11Rate, CSR_DOT11_BASIC_RATE_MASK));
-
-	switch (nonBasicRate) {
-	case SUPP_RATE_6_MBPS:
-	case SUPP_RATE_9_MBPS:
-	case SUPP_RATE_12_MBPS:
-	case SUPP_RATE_18_MBPS:
-	case SUPP_RATE_24_MBPS:
-	case SUPP_RATE_36_MBPS:
-	case SUPP_RATE_48_MBPS:
-	case SUPP_RATE_54_MBPS:
-		fSupported = true;
-		break;
-
-	default:
-		break;
-	}
-
-	return fSupported;
-}
-
-tAniEdType csr_translate_encrypt_type_to_ed_type(eCsrEncryptionType EncryptType)
-{
-	tAniEdType edType;
-
-	switch (EncryptType) {
-	default:
-	case eCSR_ENCRYPT_TYPE_NONE:
-		edType = eSIR_ED_NONE;
-		break;
-
-	case eCSR_ENCRYPT_TYPE_WEP40_STATICKEY:
-	case eCSR_ENCRYPT_TYPE_WEP40:
-		edType = eSIR_ED_WEP40;
-		break;
-
-	case eCSR_ENCRYPT_TYPE_WEP104_STATICKEY:
-	case eCSR_ENCRYPT_TYPE_WEP104:
-		edType = eSIR_ED_WEP104;
-		break;
-
-	case eCSR_ENCRYPT_TYPE_TKIP:
-		edType = eSIR_ED_TKIP;
-		break;
-
-	case eCSR_ENCRYPT_TYPE_AES:
-		edType = eSIR_ED_CCMP;
-		break;
-#ifdef FEATURE_WLAN_WAPI
-	case eCSR_ENCRYPT_TYPE_WPI:
-		edType = eSIR_ED_WPI;
-		break;
-#endif
-	/* 11w BIP */
-	case eCSR_ENCRYPT_TYPE_AES_CMAC:
-		edType = eSIR_ED_AES_128_CMAC;
-		break;
-	case eCSR_ENCRYPT_TYPE_AES_GCMP:
-		edType = eSIR_ED_GCMP;
-		break;
-	case eCSR_ENCRYPT_TYPE_AES_GCMP_256:
-		edType = eSIR_ED_GCMP_256;
-		break;
-	case eCSR_ENCRYPT_TYPE_AES_GMAC_128:
-		edType = eSIR_ED_AES_GMAC_128;
-		break;
-	case eCSR_ENCRYPT_TYPE_AES_GMAC_256:
-		edType = eSIR_ED_AES_GMAC_256;
-		break;
-	}
-
-	return edType;
-}
-
 bool csr_is_bssid_match(struct qdf_mac_addr *pProfBssid,
 			struct qdf_mac_addr *BssBssid)
 {
@@ -1490,21 +1202,6 @@ void csr_release_profile(struct mac_context *mac,
 	}
 }
 
-tSirResultCodes csr_get_de_auth_rsp_status_code(struct deauth_rsp *pSmeRsp)
-{
-	uint8_t *pBuffer = (uint8_t *) pSmeRsp;
-	uint32_t ret;
-
-	pBuffer +=
-		(sizeof(uint16_t) + sizeof(uint16_t) + sizeof(uint8_t) +
-		 sizeof(uint16_t));
-	/* tSirResultCodes is an enum, assuming is 32bit */
-	/* If we cannot make this assumption, use copymemory */
-	qdf_get_u32(pBuffer, &ret);
-
-	return (tSirResultCodes) ret;
-}
-
 enum bss_type csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype)
 {
 	enum bss_type ret;
@@ -1628,37 +1325,6 @@ csr_get_cfg_dot11_mode_from_csr_phy_mode(struct csr_roam_profile *pProfile,
 	return cfgDot11Mode;
 }
 
-QDF_STATUS csr_get_regulatory_domain_for_country(struct mac_context *mac,
-						 uint8_t *pCountry,
-						 v_REGDOMAIN_t *pDomainId,
-						 enum country_src source)
-{
-	QDF_STATUS status = QDF_STATUS_E_INVAL;
-	QDF_STATUS qdf_status;
-	uint8_t countryCode[CDS_COUNTRY_CODE_LEN + 1];
-	v_REGDOMAIN_t domainId;
-
-	if (pCountry) {
-		countryCode[0] = pCountry[0];
-		countryCode[1] = pCountry[1];
-		qdf_status = wlan_reg_get_domain_from_country_code(&domainId,
-								  countryCode,
-								  source);
-
-		if (QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			if (pDomainId)
-				*pDomainId = domainId;
-			status = QDF_STATUS_SUCCESS;
-		} else {
-			sme_warn("Couldn't find domain for country code %c%c",
-				pCountry[0], pCountry[1]);
-			status = QDF_STATUS_E_INVAL;
-		}
-	}
-
-	return status;
-}
-
 QDF_STATUS csr_get_modify_profile_fields(struct mac_context *mac,
 					uint32_t sessionId,
 					 tCsrRoamModifyProfileFields *
@@ -1751,46 +1417,6 @@ const char *sme_bss_type_to_string(const uint8_t bss_type)
 	}
 }
 
-/**
- * csr_wait_for_connection_update() - Wait for hw mode update
- * @mac: Pointer to the MAC context
- * @do_release_reacquire_lock: Indicates whether release and
- * re-acquisition of SME global lock is required.
- *
- * Waits for CONNECTION_UPDATE_TIMEOUT time so that the
- * hw mode update can get processed.
- *
- * Return: True if the wait was successful, false otherwise
- */
-bool csr_wait_for_connection_update(struct mac_context *mac,
-		bool do_release_reacquire_lock)
-{
-	QDF_STATUS status, ret;
-
-	if (do_release_reacquire_lock == true) {
-		ret = sme_release_global_lock(&mac->sme);
-		if (!QDF_IS_STATUS_SUCCESS(ret)) {
-			cds_err("lock release fail %d", ret);
-			return false;
-		}
-	}
-
-	status = policy_mgr_wait_for_connection_update(mac->psoc);
-
-	if (do_release_reacquire_lock == true) {
-		ret = sme_acquire_global_lock(&mac->sme);
-		if (!QDF_IS_STATUS_SUCCESS(ret))
-			return false;
-	}
-
-	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		cds_err("wait for event failed");
-		return false;
-	}
-
-	return true;
-}
-
 /**
  * csr_is_ndi_started() - function to check if NDI is started
  * @mac_ctx: handle to mac context