qcacld-3.0: Replace typedef eCsrAuthType

eCsrAuthType is the enum of AKMs to be used during connection.
So the name eCsrAuthType is misleading as akm and auth algo are
different.
Also the Linux Coding Style doesn't allow mixed-case names and
so-called Hungarian notation, so rename the enum eCsrAuthType to
be compliant.

Change-Id: I35e18d1f84babd0ef2928ae9d7258028d4c9b3c5
CRs-Fixed: 2463813

core/hdd/inc/wlan_hdd_assoc.h

@@ -180,7 +180,7 @@ struct hdd_connection_info {
 	tCsrSSIDInfo ssid;
 	uint8_t sta_id[MAX_PEERS];
 	struct qdf_mac_addr peer_macaddr[MAX_PEERS];
-	eCsrAuthType auth_type;
+	enum csr_akm_type auth_type;
 	eCsrEncryptionType uc_encrypt_type;
 	eCsrEncryptionType mc_encrypt_type;
 	uint8_t channel;
@@ -206,7 +206,7 @@ struct hdd_connection_info {
 	int32_t assoc_status_code;
 	uint32_t cca;
 	tCsrSSIDInfo last_ssid;
-	eCsrAuthType last_auth_type;
+	enum csr_akm_type last_auth_type;
 	char auth_time[HDD_TIME_STRING_LEN];
 	char connect_time[HDD_TIME_STRING_LEN];
 	enum phy_ch_width ch_width;
@@ -315,7 +315,7 @@ QDF_STATUS hdd_sme_roam_callback(void *context,
  * Return: 0 on success, error number otherwise
  */
 int hdd_set_genie_to_csr(struct hdd_adapter *adapter,
-			 eCsrAuthType *rsn_auth_type);
+			 enum csr_akm_type *rsn_auth_type);
 
 /**
  * hdd_set_csr_auth_type() - set csr auth type
@@ -325,7 +325,7 @@ int hdd_set_genie_to_csr(struct hdd_adapter *adapter,
  * Return: 0 on success, error number otherwise
  */
 int hdd_set_csr_auth_type(struct hdd_adapter *adapter,
-			  eCsrAuthType rsn_auth_type);
+			  enum csr_akm_type rsn_auth_type);
 
 #ifdef FEATURE_WLAN_TDLS
 /**

core/hdd/src/wlan_hdd_assoc.c

@@ -5064,12 +5064,12 @@ hdd_sme_roam_callback(void *context, struct csr_roam_info *roam_info,
 /**
  * hdd_translate_fils_rsn_to_csr_auth() - Translate FILS RSN to CSR auth type
  * @auth_suite: auth suite
- * @auth_type: pointer to eCsrAuthType
+ * @auth_type: pointer to enum csr_akm_type
  *
  * Return: None
  */
 static void hdd_translate_fils_rsn_to_csr_auth(int8_t auth_suite[4],
-					eCsrAuthType *auth_type)
+					enum csr_akm_type *auth_type)
 {
 	if (!memcmp(auth_suite, ccp_rsn_oui_0e, 4))
 		*auth_type = eCSR_AUTH_TYPE_FILS_SHA256;
@@ -5082,7 +5082,7 @@ static void hdd_translate_fils_rsn_to_csr_auth(int8_t auth_suite[4],
 }
 #else
 static inline void hdd_translate_fils_rsn_to_csr_auth(int8_t auth_suite[4],
-					eCsrAuthType *auth_type)
+					enum csr_akm_type *auth_type)
 {
 }
 #endif
@@ -5091,12 +5091,12 @@ static inline void hdd_translate_fils_rsn_to_csr_auth(int8_t auth_suite[4],
 /**
  * hdd_translate_sae_rsn_to_csr_auth() - Translate SAE RSN to CSR auth type
  * @auth_suite: auth suite
- * @auth_type: pointer to eCsrAuthType
+ * @auth_type: pointer to enum csr_akm_type
  *
  * Return: None
  */
 static void hdd_translate_sae_rsn_to_csr_auth(int8_t auth_suite[4],
-					eCsrAuthType *auth_type)
+					enum csr_akm_type *auth_type)
 {
 	if (qdf_mem_cmp(auth_suite, ccp_rsn_oui_80, 4) == 0)
 		*auth_type = eCSR_AUTH_TYPE_SAE;
@@ -5106,7 +5106,7 @@ static void hdd_translate_sae_rsn_to_csr_auth(int8_t auth_suite[4],
 }
 #else
 static inline void hdd_translate_sae_rsn_to_csr_auth(int8_t auth_suite[4],
-					eCsrAuthType *auth_type)
+					enum csr_akm_type *auth_type)
 {
 }
 #endif
@@ -5115,11 +5115,11 @@ static inline void hdd_translate_sae_rsn_to_csr_auth(int8_t auth_suite[4],
  * hdd_translate_rsn_to_csr_auth_type() - Translate RSN to CSR auth type
  * @auth_suite: auth suite
  *
- * Return: eCsrAuthType enumeration
+ * Return: enum csr_akm_type enumeration
  */
-eCsrAuthType hdd_translate_rsn_to_csr_auth_type(uint8_t auth_suite[4])
+enum csr_akm_type hdd_translate_rsn_to_csr_auth_type(uint8_t auth_suite[4])
 {
-	eCsrAuthType auth_type = eCSR_AUTH_TYPE_UNKNOWN;
+	enum csr_akm_type auth_type = eCSR_AUTH_TYPE_UNKNOWN;
 	/* is the auth type supported? */
 	if (memcmp(auth_suite, ccp_rsn_oui01, 4) == 0) {
 		auth_type = eCSR_AUTH_TYPE_RSN;
@@ -5171,11 +5171,11 @@ eCsrAuthType hdd_translate_rsn_to_csr_auth_type(uint8_t auth_suite[4])
  * hdd_translate_wpa_to_csr_auth_type() - Translate WPA to CSR auth type
  * @auth_suite: auth suite
  *
- * Return: eCsrAuthType enumeration
+ * Return: enum csr_akm_type enumeration
  */
-eCsrAuthType hdd_translate_wpa_to_csr_auth_type(uint8_t auth_suite[4])
+enum csr_akm_type hdd_translate_wpa_to_csr_auth_type(uint8_t auth_suite[4])
 {
-	eCsrAuthType auth_type = eCSR_AUTH_TYPE_UNKNOWN;
+	enum csr_akm_type auth_type = eCSR_AUTH_TYPE_UNKNOWN;
 	/* is the auth type supported? */
 	if (memcmp(auth_suite, ccp_wpa_oui01, 4) == 0) {
 		auth_type = eCSR_AUTH_TYPE_WPA;
@@ -5288,7 +5288,7 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
 				 u8 *bssid,
 				 eCsrEncryptionType *encrypt_type,
 				 eCsrEncryptionType *mc_encrypt_type,
-				 eCsrAuthType *auth_type,
+				 enum csr_akm_type *auth_type,
 #ifdef WLAN_FEATURE_11W
 				 uint8_t *mfp_required, uint8_t *mfp_capable,
 #endif
@@ -5419,7 +5419,7 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
  * Return: void
  */
 static void hdd_set_def_rsne_override(
-	struct csr_roam_profile *roam_profile, eCsrAuthType *auth_type)
+	struct csr_roam_profile *roam_profile, enum csr_akm_type *auth_type)
 {
 
 	hdd_debug("Set def values in roam profile");
@@ -5444,7 +5444,7 @@ static void hdd_set_def_rsne_override(
  * Return: 0 on success, error number otherwise
  */
 int hdd_set_genie_to_csr(struct hdd_adapter *adapter,
-			 eCsrAuthType *rsn_auth_type)
+			 enum csr_akm_type *rsn_auth_type)
 {
 	struct csr_roam_profile *roam_profile;
 	uint8_t *security_ie;
@@ -5568,7 +5568,7 @@ int hdd_set_genie_to_csr(struct hdd_adapter *adapter,
  */
 static
 bool hdd_check_fils_rsn_n_set_auth_type(struct csr_roam_profile *roam_profile,
-					eCsrAuthType rsn_auth_type)
+					enum csr_akm_type rsn_auth_type)
 {
 	bool is_fils_rsn = false;
 
@@ -5588,7 +5588,7 @@ bool hdd_check_fils_rsn_n_set_auth_type(struct csr_roam_profile *roam_profile,
 #else
 static
 bool hdd_check_fils_rsn_n_set_auth_type(struct csr_roam_profile *roam_profile,
-					eCsrAuthType rsn_auth_type)
+					enum csr_akm_type rsn_auth_type)
 {
 	return false;
 }
@@ -5602,7 +5602,7 @@ bool hdd_check_fils_rsn_n_set_auth_type(struct csr_roam_profile *roam_profile,
  * Return: 0 on success, error number otherwise
  */
 int hdd_set_csr_auth_type(struct hdd_adapter *adapter,
-			  eCsrAuthType rsn_auth_type)
+			  enum csr_akm_type rsn_auth_type)
 {
 	struct csr_roam_profile *roam_profile;
 	struct hdd_station_ctx *sta_ctx =

core/hdd/src/wlan_hdd_cfg80211.c

@@ -5154,7 +5154,7 @@ int wlan_hdd_send_roam_auth_event(struct hdd_adapter *adapter, uint8_t *bssid,
 {
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	struct sk_buff *skb = NULL;
-	eCsrAuthType auth_type;
+	enum csr_akm_type auth_type;
 	uint32_t fils_params_len;
 	int status;
 	enum qca_roam_reason hdd_roam_reason;
@@ -16457,7 +16457,7 @@ static int wlan_hdd_cfg80211_connect_start(struct hdd_adapter *adapter,
 	struct hdd_station_ctx *hdd_sta_ctx;
 	uint32_t roam_id = INVALID_ROAM_ID;
 	struct csr_roam_profile *roam_profile;
-	eCsrAuthType rsn_auth_type;
+	enum csr_akm_type rsn_auth_type;
 	struct sme_config_params *sme_config;
 	uint8_t channel = 0;
 	mac_handle_t mac_handle;

core/hdd/src/wlan_hdd_hostapd.h

@@ -40,7 +40,7 @@ struct hdd_adapter *hdd_wlan_create_ap_dev(struct hdd_context *hdd_ctx,
 				      unsigned char name_assign_type,
 				      uint8_t *name);
 
-eCsrAuthType
+enum csr_akm_type
 hdd_translate_rsn_to_csr_auth_type(uint8_t auth_suite[4]);
 
 int hdd_softap_set_channel_change(struct net_device *dev,
@@ -95,7 +95,7 @@ hdd_translate_rsn_to_csr_encryption_type(uint8_t cipher_suite[4]);
 eCsrEncryptionType
 hdd_translate_rsn_to_csr_encryption_type(uint8_t cipher_suite[4]);
 
-eCsrAuthType
+enum csr_akm_type
 hdd_translate_wpa_to_csr_auth_type(uint8_t auth_suite[4]);
 
 eCsrEncryptionType

core/mac/src/pe/lim/lim_ft_preauth.c

@@ -226,7 +226,7 @@ void lim_perform_ft_pre_auth(struct mac_context *mac, QDF_STATUS status,
 {
 	tSirMacAuthFrameBody authFrame;
 	unsigned int session_id;
-	eCsrAuthType auth_type;
+	enum csr_akm_type auth_type;
 
 	if (!pe_session) {
 		pe_err("pe_session is NULL");

core/sap/inc/sap_api.h

@@ -249,7 +249,7 @@ typedef struct sap_StationAssocIndication_s {
 	uint32_t assocReqLength;
 	uint8_t *assocReqPtr;
 	bool fWmmEnabled;
-	eCsrAuthType negotiatedAuthType;
+	enum csr_akm_type negotiatedAuthType;
 	eCsrEncryptionType negotiatedUCEncryptionType;
 	eCsrEncryptionType negotiatedMCEncryptionType;
 	bool fAuthRequired;

core/sme/inc/csr_api.h

@@ -32,7 +32,7 @@
 
 #define CSR_INVALID_SCANRESULT_HANDLE       (NULL)
 
-typedef enum {
+enum csr_akm_type {
 	/* never used */
 	eCSR_AUTH_TYPE_NONE,
 	/* MAC layer authentication types */
@@ -73,7 +73,7 @@ typedef enum {
 	eCSR_AUTH_TYPE_FAILED = 0xff,
 	eCSR_AUTH_TYPE_UNKNOWN = eCSR_AUTH_TYPE_FAILED,
 
-} eCsrAuthType;
+};
 
 typedef enum {
 	eCSR_ENCRYPT_TYPE_NONE,
@@ -245,7 +245,7 @@ typedef struct tagCsrEncryptionList {
 
 typedef struct tagCsrAuthList {
 	uint32_t numEntries;
-	eCsrAuthType authType[eCSR_NUM_OF_SUPPORT_AUTH_TYPE];
+	enum csr_akm_type authType[eCSR_NUM_OF_SUPPORT_AUTH_TYPE];
 } tCsrAuthList, *tpCsrAuthList;
 
 #ifdef FEATURE_WLAN_ESE
@@ -747,7 +747,7 @@ struct csr_roam_profile {
 	uint32_t phyMode;
 	eCsrRoamBssType BSSType;
 	tCsrAuthList AuthType;
-	eCsrAuthType negotiatedAuthType;
+	enum csr_akm_type negotiatedAuthType;
 	tCsrAuthList akm_list;
 	tCsrEncryptionList EncryptionType;
 	/* This field is for output only, not for input */
@@ -856,7 +856,7 @@ typedef struct tagCsrRoamConnectedProfile {
 	struct qdf_mac_addr bssid;
 	uint16_t beaconInterval;
 	eCsrRoamBssType BSSType;
-	eCsrAuthType AuthType;
+	enum csr_akm_type AuthType;
 	tCsrAuthList AuthInfo;
 	tCsrAuthList akm_list;
 	eCsrEncryptionType EncryptionType;

core/sme/inc/csr_internal.h

@@ -301,7 +301,7 @@ struct roam_cmd {
 struct setkey_cmd {
 	uint32_t roamId;
 	eCsrEncryptionType encType;
-	eCsrAuthType authType;
+	enum csr_akm_type authType;
 	tAniKeyDirection keyDirection;  /* Tx, Rx or Tx-and-Rx */
 	struct qdf_mac_addr peermac;    /* Peer's MAC address. ALL 1's for group key */
 	uint8_t paeRole;        /* 0 for supplicant */

core/sme/inc/csr_support.h

@@ -357,7 +357,7 @@ QDF_STATUS csr_validate_mcc_beacon_interval(struct mac_context *mac_ctx,
 					    enum QDF_OPMODE cur_bss_persona);
 
 bool csr_is_profile11r(struct mac_context *mac, struct csr_roam_profile *pProfile);
-bool csr_is_auth_type11r(struct mac_context *mac, eCsrAuthType AuthType,
+bool csr_is_auth_type11r(struct mac_context *mac, enum csr_akm_type AuthType,
 			 uint8_t mdiePresent);
 #ifdef FEATURE_WLAN_ESE
 bool csr_is_profile_ese(struct csr_roam_profile *pProfile);
@@ -369,6 +369,6 @@ bool csr_is_profile_ese(struct csr_roam_profile *pProfile);
  *
  * Return: true, if auth type is ese, false otherwise
  */
-bool csr_is_auth_type_ese(eCsrAuthType AuthType);
+bool csr_is_auth_type_ese(enum csr_akm_type AuthType);
 
 #endif

core/sme/src/csr/csr_api_roam.c

@@ -204,7 +204,7 @@ static inline QDF_STATUS csr_sae_callback(struct mac_context *mac_ctx,
 
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
-enum mgmt_auth_type diag_auth_type_from_csr_type(eCsrAuthType authtype)
+enum mgmt_auth_type diag_auth_type_from_csr_type(enum csr_akm_type authtype)
 {
 	int n = AUTH_OPEN;
 
@@ -5855,7 +5855,7 @@ void csr_reset_pmkid_candidate_list(struct mac_context *mac,
  */
 static QDF_STATUS csr_roam_save_params(struct mac_context *mac_ctx,
 				struct csr_roam_session *session_ptr,
-				eCsrAuthType auth_type,
+				enum csr_akm_type auth_type,
 				tDot11fBeaconIEs *ie_ptr,
 				tDot11fBeaconIEs *ie_local)
 {
@@ -6028,7 +6028,7 @@ static QDF_STATUS csr_roam_save_params(struct mac_context *mac_ctx,
 
 static QDF_STATUS
 csr_roam_save_security_rsp_ie(struct mac_context *mac,
-			      uint32_t sessionId, eCsrAuthType authType,
+			      uint32_t sessionId, enum csr_akm_type authType,
 			      struct bss_description *pSirBssDesc,
 			      tDot11fBeaconIEs *pIes)
 {
@@ -10987,13 +10987,13 @@ static QDF_STATUS csr_send_reset_ap_caps_changed(struct mac_context *mac,
 
 #ifdef FEATURE_WLAN_ESE
 /**
- * csr_convert_ese_akm_to_ani() - Convert eCsrAuthType ESE akm value to
+ * csr_convert_ese_akm_to_ani() - Convert enum csr_akm_type ESE akm value to
  * equivalent enum ani_akm_type value
  * @akm_type: value of type enum ani_akm_type
  *
  * Return: ani_akm_type value corresponding
  */
-static enum ani_akm_type csr_convert_ese_akm_to_ani(eCsrAuthType akm_type)
+static enum ani_akm_type csr_convert_ese_akm_to_ani(enum csr_akm_type akm_type)
 {
 	switch (akm_type) {
 	case eCSR_AUTH_TYPE_CCKM_RSN:
@@ -11004,7 +11004,7 @@ static enum ani_akm_type csr_convert_ese_akm_to_ani(eCsrAuthType akm_type)
 }
 #else
 static inline enum
-ani_akm_type csr_convert_ese_akm_to_ani(eCsrAuthType akm_type)
+ani_akm_type csr_convert_ese_akm_to_ani(enum csr_akm_type akm_type)
 {
 	return ANI_AKM_TYPE_UNKNOWN;
 }
@@ -11012,13 +11012,13 @@ ani_akm_type csr_convert_ese_akm_to_ani(eCsrAuthType akm_type)
 
 #ifdef WLAN_FEATURE_SAE
 /**
- * csr_convert_sae_akm_to_ani() - Convert eCsrAuthType SAE akm value to
+ * csr_convert_sae_akm_to_ani() - Convert enum csr_akm_type SAE akm value to
  * equivalent enum ani_akm_type value
  * @akm_type: value of type enum ani_akm_type
  *
  * Return: ani_akm_type value corresponding
  */
-static enum ani_akm_type csr_convert_sae_akm_to_ani(eCsrAuthType akm_type)
+static enum ani_akm_type csr_convert_sae_akm_to_ani(enum csr_akm_type akm_type)
 {
 	switch (akm_type) {
 	case eCSR_AUTH_TYPE_SAE:
@@ -11031,20 +11031,21 @@ static enum ani_akm_type csr_convert_sae_akm_to_ani(eCsrAuthType akm_type)
 }
 #else
 static inline
-enum ani_akm_type csr_convert_sae_akm_to_ani(eCsrAuthType akm_type)
+enum ani_akm_type csr_convert_sae_akm_to_ani(enum csr_akm_type akm_type)
 {
 	return ANI_AKM_TYPE_UNKNOWN;
 }
 #endif
 
 /**
- * csr_convert_csr_to_ani_akm_type() - Convert eCsrAuthType value to equivalent
- * enum ani_akm_type value
+ * csr_convert_csr_to_ani_akm_type() - Convert enum csr_akm_type value to
+ * equivalent enum ani_akm_type value
  * @akm_type: value of type enum ani_akm_type
  *
  * Return: ani_akm_type value corresponding
  */
-static enum ani_akm_type csr_convert_csr_to_ani_akm_type(eCsrAuthType akm_type)
+static enum ani_akm_type
+csr_convert_csr_to_ani_akm_type(enum csr_akm_type akm_type)
 {
 	enum ani_akm_type ani_akm;
 
@@ -11102,14 +11103,14 @@ static enum ani_akm_type csr_convert_csr_to_ani_akm_type(eCsrAuthType akm_type)
 
 /**
  * csr_translate_akm_type() - Convert ani_akm_type value to equivalent
- * eCsrAuthType
+ * enum csr_akm_type
  * @akm_type: value of type ani_akm_type
  *
- * Return: eCsrAuthType value
+ * Return: enum csr_akm_type value
  */
-static eCsrAuthType csr_translate_akm_type(enum ani_akm_type akm_type)
+static enum csr_akm_type csr_translate_akm_type(enum ani_akm_type akm_type)
 {
-	eCsrAuthType csr_akm_type;
+	enum csr_akm_type csr_akm_type;
 
 	switch (akm_type)
 	{
@@ -11315,7 +11316,7 @@ csr_roam_chk_lnk_assoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 	struct csr_roam_info *roam_info;
 	struct assoc_ind *pAssocInd;
 	enum mac_status_code mac_status_code = eSIR_MAC_SUCCESS_STATUS;
-	eCsrAuthType csr_akm_type;
+	enum csr_akm_type csr_akm_type;
 
 	sme_debug("Receive WNI_SME_ASSOC_IND from SME");
 	pAssocInd = (struct assoc_ind *) msg_ptr;
@@ -13546,7 +13547,7 @@ static bool csr_is_encryption_in_list(struct mac_context *mac,
 }
 
 static bool csr_is_auth_in_list(struct mac_context *mac, tCsrAuthList *pAuthList,
-				eCsrAuthType authType)
+				enum csr_akm_type authType)
 {
 	bool fFound = false;
 	uint32_t idx;
@@ -15261,7 +15262,7 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 	struct action_oui_search_attr vendor_ap_search_attr;
 	tDot11fIEVHTCaps *vht_caps = NULL;
 	bool bvalue = 0;
-	eCsrAuthType akm;
+	enum csr_akm_type akm;
 	bool force_max_nss;
 	uint8_t ap_nss;
 
@@ -19571,7 +19572,7 @@ csr_roam_offload_scan(struct mac_context *mac_ctx, uint8_t session_id,
 	uint8_t i, temp_session_id;
 	uint8_t op_channel;
 	bool prev_roaming_state;
-	eCsrAuthType roam_profile_akm = eCSR_AUTH_TYPE_UNKNOWN;
+	enum csr_akm_type roam_profile_akm = eCSR_AUTH_TYPE_UNKNOWN;
 	uint32_t fw_akm_bitmap;
 
 	sme_debug("RSO Command %d, Session id %d, Reason %d", command,

core/sme/src/csr/csr_api_scan.c

@@ -2049,7 +2049,7 @@ csr_scan_get_channel_for_hw_mode_change(struct mac_context *mac_ctx,
 	return candidate_chan;
 }
 
-static enum wlan_auth_type csr_covert_auth_type_new(eCsrAuthType auth)
+static enum wlan_auth_type csr_covert_auth_type_new(enum csr_akm_type auth)
 {
 	switch (auth) {
 	case eCSR_AUTH_TYPE_NONE:
@@ -2115,7 +2115,7 @@ static enum wlan_auth_type csr_covert_auth_type_new(eCsrAuthType auth)
 	}
 }
 
-static eCsrAuthType csr_covert_auth_type_old(enum wlan_auth_type auth)
+static enum csr_akm_type csr_covert_auth_type_old(enum wlan_auth_type auth)
 {
 	switch (auth) {
 	case WLAN_AUTH_TYPE_OPEN_SYSTEM:

core/sme/src/csr/csr_inside_api.h

@@ -94,7 +94,7 @@ struct tag_csrscan_result {
 	eCsrEncryptionType ucEncryptionType;
 	eCsrEncryptionType mcEncryptionType;
 	/* Preferred auth type that matched with the profile. */
-	eCsrAuthType authType;
+	enum csr_akm_type authType;
 	int  bss_score;
 
 	tCsrScanResultInfo Result;
@@ -542,7 +542,7 @@ void csr_get_vdev_type_nss(struct mac_context *mac_ctx,
  *
  * Return: DIAG auth type
  */
-enum mgmt_auth_type diag_auth_type_from_csr_type(eCsrAuthType authtype);
+enum mgmt_auth_type diag_auth_type_from_csr_type(enum csr_akm_type authtype);
 /**
  * diag_enc_type_from_csr_type() - to convert CSR encr type to DIAG encr type
  * @enctype: CSR encryption type

core/sme/src/csr/csr_roam_preauth.c

@@ -582,7 +582,7 @@ void csr_roam_ft_pre_auth_rsp_processor(struct mac_context *mac_ctx,
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct csr_roam_info *roam_info;
-	eCsrAuthType conn_Auth_type;
+	enum csr_akm_type conn_Auth_type;
 	uint32_t session_id = preauth_rsp->smeSessionId;
 	struct csr_roam_session *csr_session = CSR_GET_SESSION(mac_ctx,
 				session_id);

core/sme/src/csr/csr_util.c

@@ -2542,8 +2542,8 @@ QDF_STATUS csr_validate_mcc_beacon_interval(struct mac_context *mac_ctx,
  *
  * Return: true if is 11R auth type, false otherwise
  */
-bool csr_is_auth_type11r(struct mac_context *mac, eCsrAuthType auth_type,
-			uint8_t mdie_present)
+bool csr_is_auth_type11r(struct mac_context *mac, enum csr_akm_type auth_type,
+			 uint8_t mdie_present)
 {
 	switch (auth_type) {
 	case eCSR_AUTH_TYPE_OPEN_SYSTEM:
@@ -2572,7 +2572,7 @@ bool csr_is_profile11r(struct mac_context *mac,
 				   pProfile->mdid.mdie_present);
 }
 
-bool csr_is_auth_type_ese(eCsrAuthType AuthType)
+bool csr_is_auth_type_ese(enum csr_akm_type AuthType)
 {
 	switch (AuthType) {
 	case eCSR_AUTH_TYPE_CCKM_WPA:
@@ -3143,7 +3143,7 @@ static uint8_t csr_get_oui_index_from_cipher(eCsrEncryptionType enType)
 static void csr_is_fils_auth(struct mac_context *mac_ctx,
 	uint8_t authsuites[][CSR_RSN_OUI_SIZE], uint8_t c_auth_suites,
 	uint8_t authentication[], tCsrAuthList *auth_type,
-	uint8_t index, eCsrAuthType *neg_authtype)
+	uint8_t index, enum csr_akm_type *neg_authtype)
 {
 	/*
 	 * TODO Always try with highest security
@@ -3182,7 +3182,7 @@ static void csr_is_fils_auth(struct mac_context *mac_ctx,
 static void csr_is_fils_auth(struct mac_context *mac_ctx,
 	uint8_t authsuites[][CSR_RSN_OUI_SIZE], uint8_t c_auth_suites,
 	uint8_t authentication[], tCsrAuthList *auth_type,
-	uint8_t index, eCsrAuthType *neg_authtype)
+	uint8_t index, enum csr_akm_type *neg_authtype)
 {
 }
 #endif
@@ -3206,7 +3206,7 @@ csr_check_sae_auth(struct mac_context *mac_ctx,
 		   uint8_t authsuites[][CSR_RSN_OUI_SIZE],
 		   uint8_t c_auth_suites,
 		   uint8_t authentication[], tCsrAuthList *auth_type,
-		   uint8_t index, eCsrAuthType *neg_authtype)
+		   uint8_t index, enum csr_akm_type *neg_authtype)
 {
 	if ((*neg_authtype == eCSR_AUTH_TYPE_UNKNOWN) &&
 	    csr_is_auth_ft_sae(mac_ctx, authsuites, c_auth_suites,
@@ -3227,7 +3227,7 @@ csr_check_sae_auth(struct mac_context *mac_ctx,
 static void csr_check_sae_auth(struct mac_context *mac_ctx,
 	uint8_t authsuites[][CSR_RSN_OUI_SIZE], uint8_t c_auth_suites,
 	uint8_t authentication[], tCsrAuthList *auth_type,
-	uint8_t index, eCsrAuthType *neg_authtype)
+	uint8_t index, enum csr_akm_type *neg_authtype)
 {
 }
 #endif
@@ -3287,7 +3287,7 @@ static bool csr_get_rsn_information(struct mac_context *mac_ctx,
 				    tDot11fIERSN *rsn_ie, uint8_t *ucast_cipher,
 				    uint8_t *mcast_cipher, uint8_t *auth_suite,
 				    struct rsn_caps *capabilities,
-				    eCsrAuthType *negotiated_authtype,
+				    enum csr_akm_type *negotiated_authtype,
 				    eCsrEncryptionType *negotiated_mccipher,
 				    uint8_t *gp_mgmt_cipher,
 				    tAniEdType *mgmt_encryption_type,
@@ -3306,7 +3306,7 @@ static bool csr_get_rsn_information(struct mac_context *mac_ctx,
 	uint8_t authentication[CSR_RSN_OUI_SIZE];
 	uint8_t mccipher_arr[CSR_RSN_MAX_MULTICAST_CYPHERS][CSR_RSN_OUI_SIZE];
 	uint8_t group_mgmt_arr[CSR_RSN_MAX_MULTICAST_CYPHERS][CSR_RSN_OUI_SIZE];
-	eCsrAuthType neg_authtype = eCSR_AUTH_TYPE_UNKNOWN;
+	enum csr_akm_type neg_authtype = eCSR_AUTH_TYPE_UNKNOWN;
 
 	if (!rsn_ie->present)
 		goto end;
@@ -3665,7 +3665,7 @@ static bool csr_is_rsn_match(struct mac_context *mac_ctx, tCsrAuthList *pAuthTyp
 			     bool *pMFPEnabled, uint8_t *pMFPRequired,
 			     uint8_t *pMFPCapable,
 			     tDot11fBeaconIEs *pIes,
-			     eCsrAuthType *pNegotiatedAuthType,
+			     enum csr_akm_type *negotiated_akm,
 			     eCsrEncryptionType *pNegotiatedMCCipher)
 {
 	bool fRSNMatch = false;
@@ -3675,7 +3675,7 @@ static bool csr_is_rsn_match(struct mac_context *mac_ctx, tCsrAuthList *pAuthTyp
 	 */
 	fRSNMatch = csr_get_rsn_information(mac_ctx, pAuthType, enType,
 					    pEnMcType, &pIes->RSN, NULL, NULL,
-					    NULL, NULL, pNegotiatedAuthType,
+					    NULL, NULL, negotiated_akm,
 					    pNegotiatedMCCipher, NULL, NULL,
 					    false);
 #ifdef WLAN_FEATURE_11W
@@ -4010,7 +4010,7 @@ uint8_t csr_construct_rsn_ie(struct mac_context *mac, uint32_t sessionId,
 	uint8_t *pGroupMgmtCipherSuite;
 #endif
 	tDot11fBeaconIEs *pIesLocal = pIes;
-	eCsrAuthType negAuthType = eCSR_AUTH_TYPE_UNKNOWN;
+	enum csr_akm_type negAuthType = eCSR_AUTH_TYPE_UNKNOWN;
 	tDot11fIERSN rsn_ie = {0};
 	struct csr_roam_session *session = CSR_GET_SESSION(mac, sessionId);
 
@@ -4215,7 +4215,7 @@ static bool csr_get_wapi_information(struct mac_context *mac_ctx,
 				     tDot11fIEWAPI *wapi_ie,
 				     uint8_t *ucast_cipher,
 				     uint8_t *mcast_cipher, uint8_t *auth_suite,
-				     eCsrAuthType *negotiated_authtype,
+				     enum csr_akm_type *negotiated_authtype,
 				     eCsrEncryptionType *negotiated_mccipher)
 {
 	bool acceptable_cipher = false;
@@ -4227,7 +4227,7 @@ static bool csr_get_wapi_information(struct mac_context *mac_ctx,
 	uint8_t authsuites[CSR_WAPI_MAX_AUTH_SUITES][CSR_WAPI_OUI_SIZE];
 	uint8_t authentication[CSR_WAPI_OUI_SIZE];
 	uint8_t mccipher_arr[CSR_WAPI_MAX_MULTICAST_CYPHERS][CSR_WAPI_OUI_SIZE];
-	eCsrAuthType neg_authtype = eCSR_AUTH_TYPE_UNKNOWN;
+	enum csr_akm_type neg_authtype = eCSR_AUTH_TYPE_UNKNOWN;
 	uint8_t wapioui_idx = 0;
 
 	if (!wapi_ie->present)
@@ -4327,7 +4327,7 @@ static bool csr_is_wapi_match(struct mac_context *mac_ctx, tCsrAuthList *pAuthTy
 			      eCsrEncryptionType enType,
 			      tCsrEncryptionList *pEnMcType,
 			      tDot11fBeaconIEs *pIes,
-			      eCsrAuthType *pNegotiatedAuthType,
+			      enum csr_akm_type *negotiated_akm,
 			      eCsrEncryptionType *pNegotiatedMCCipher)
 {
 	bool fWapiMatch = false;
@@ -4338,8 +4338,7 @@ static bool csr_is_wapi_match(struct mac_context *mac_ctx, tCsrAuthList *pAuthTy
 	fWapiMatch =
 		csr_get_wapi_information(mac_ctx, pAuthType, enType, pEnMcType,
 					 &pIes->WAPI, NULL, NULL, NULL,
-					 pNegotiatedAuthType,
-					 pNegotiatedMCCipher);
+					 negotiated_akm, pNegotiatedMCCipher);
 
 	return fWapiMatch;
 }
@@ -4543,7 +4542,7 @@ static bool csr_get_wpa_cyphers(struct mac_context *mac_ctx, tCsrAuthList *auth_
 				tCsrEncryptionList *mc_encryption,
 				tDot11fIEWPA *wpa_ie, uint8_t *ucast_cipher,
 				uint8_t *mcast_cipher, uint8_t *auth_suite,
-				eCsrAuthType *negotiated_authtype,
+				enum csr_akm_type *negotiated_authtype,
 				eCsrEncryptionType *negotiated_mccipher)
 {
 	bool acceptable_cipher = false;
@@ -4556,7 +4555,7 @@ static bool csr_get_wpa_cyphers(struct mac_context *mac_ctx, tCsrAuthList *auth_
 	uint8_t mccipher_arr[1][CSR_WPA_OUI_SIZE];
 	uint8_t i;
 	uint8_t index;
-	eCsrAuthType neg_authtype = eCSR_AUTH_TYPE_UNKNOWN;
+	enum csr_akm_type neg_authtype = eCSR_AUTH_TYPE_UNKNOWN;
 
 	if (!wpa_ie->present)
 		goto end;
@@ -4673,7 +4672,7 @@ static bool csr_is_wpa_encryption_match(struct mac_context *mac,
 					eCsrEncryptionType enType,
 					tCsrEncryptionList *pEnMcType,
 					tDot11fBeaconIEs *pIes,
-					eCsrAuthType *pNegotiatedAuthtype,
+					enum csr_akm_type *pNegotiatedAuthtype,
 					eCsrEncryptionType *pNegotiatedMCCipher)
 {
 	bool fWpaMatch = false;
@@ -5266,7 +5265,7 @@ static bool csr_validate_any_default(struct mac_context *mac_ctx,
 				     uint8_t *mfp_required,
 				     uint8_t *mfp_capable,
 				     tDot11fBeaconIEs *ies_ptr,
-				     eCsrAuthType *neg_auth_type,
+				     enum csr_akm_type *neg_auth_type,
 				     struct bss_description *bss_desc,
 				     eCsrEncryptionType *uc_cipher,
 				     eCsrEncryptionType *mc_cipher)

core/wma/inc/wma.h

@@ -1634,7 +1634,7 @@ typedef struct {
 int wma_process_fw_event_handler(ol_scn_t scn_handle, void *ev,
 				 uint8_t rx_ctx);
 
-A_UINT32 e_csr_auth_type_to_rsn_authmode(eCsrAuthType authtype,
+A_UINT32 e_csr_auth_type_to_rsn_authmode(enum csr_akm_type authtype,
 					 eCsrEncryptionType encr);
 A_UINT32 e_csr_encryption_type_to_rsn_cipherset(eCsrEncryptionType encr);
 

core/wma/inc/wma_internal.h

@@ -267,7 +267,7 @@ QDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle,
 					   uint8_t *chan_list,
 					   uint8_t list_type, uint32_t vdev_id);
 
-A_UINT32 e_csr_auth_type_to_rsn_authmode(eCsrAuthType authtype,
+A_UINT32 e_csr_auth_type_to_rsn_authmode(enum csr_akm_type authtype,
 					 eCsrEncryptionType encr);
 
 A_UINT32 e_csr_encryption_type_to_rsn_cipherset(eCsrEncryptionType encr);

core/wma/src/wma_scan_roam.c

@@ -714,7 +714,7 @@ QDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle,
  *
  * Return: WMI RSN auth mode
  */
-A_UINT32 e_csr_auth_type_to_rsn_authmode(eCsrAuthType authtype,
+A_UINT32 e_csr_auth_type_to_rsn_authmode(enum csr_akm_type authtype,
 					 eCsrEncryptionType encr)
 {
 	switch (authtype) {