qcacld-3.0: Rename struct sAniSirGlobal to mac_context

The primary data structure used within the protocol stack is currently
named sAniSirGlobal. This naming is problematic for two reasons.
First, the "Ani" and "Sir" are archaic references that should be
replaced throughout the driver. Second, camelCase is frowned upon by
the Linux coding style. In order to address these issues, rename
sAniSirGlobal to mac_context.

Change-Id: Ibaaeb5296e42a24c66d4adf4f720d32a9ae41888
CRs-Fixed: 2345128

core/mac/inc/ani_global.h

@@ -840,9 +840,10 @@ struct mgmt_beacon_probe_filter {
 	uint8_t sap_channel[SIR_MAX_SUPPORTED_BSS];
 };
 
-/* ------------------------------------------------------------------- */
-/* / MAC Sirius parameter structure */
-typedef struct sAniSirGlobal {
+/**
+ * struct mac_context - Global MAC context
+ */
+struct mac_context {
 	enum qdf_driver_type gDriverType;
 
 	tAniSirCfg cfg;
@@ -912,7 +913,10 @@ typedef struct sAniSirGlobal {
 	tDot11fIEhe_cap he_cap_5g;
 #endif
 	bool obss_scan_offload;
-} tAniSirGlobal;
+};
+
+/* legacy definitions in place until converted to use struct mac_context */
+typedef struct mac_context tAniSirGlobal;
 
 
 #ifdef FEATURE_WLAN_TDLS

core/mac/inc/sir_api.h

@@ -29,12 +29,8 @@
 #ifndef __SIR_API_H
 #define __SIR_API_H
 
-
-/* Take care to avoid redefinition of this type, if it is */
-/* already defined in "halWmmApi.h" */
-#if !defined(_HALMAC_WMM_API_H)
-typedef struct sAniSirGlobal *tpAniSirGlobal;
-#endif
+/* legacy definition */
+typedef struct mac_context *tpAniSirGlobal;
 
 #include "qdf_types.h"
 #include "cds_regdomain.h"

core/mac/src/include/parser_api.h

@@ -537,7 +537,7 @@ struct s_ext_cap {
 	uint8_t twt_responder_support:1;
 };
 
-uint8_t sirIsPropCapabilityEnabled(struct sAniSirGlobal *pMac, uint32_t bitnum);
+uint8_t sirIsPropCapabilityEnabled(struct mac_context *pMac, uint32_t bitnum);
 
 #define CFG_GET_INT(nStatus, pMac, nItem, cfg)  do { \
 		(nStatus) = wlan_cfg_get_int((pMac), (nItem), &(cfg)); \
@@ -579,57 +579,57 @@ void swap_bit_field16(uint16_t in, uint16_t *out);
 /* generated code: */
 
 QDF_STATUS
-sir_convert_probe_req_frame2_struct(struct sAniSirGlobal *pMac,
+sir_convert_probe_req_frame2_struct(struct mac_context *pMac,
 				uint8_t *frame, uint32_t len,
 				tpSirProbeReq probe);
 
 QDF_STATUS
-sir_convert_probe_frame2_struct(struct sAniSirGlobal *pMac, uint8_t *frame,
+sir_convert_probe_frame2_struct(struct mac_context *pMac, uint8_t *frame,
 				uint32_t len, tpSirProbeRespBeacon probe);
 
 QDF_STATUS
-sir_convert_assoc_req_frame2_struct(struct sAniSirGlobal *pMac,
+sir_convert_assoc_req_frame2_struct(struct mac_context *pMac,
 				uint8_t *frame, uint32_t len,
 				tpSirAssocReq assoc);
 
 QDF_STATUS
-sir_convert_assoc_resp_frame2_struct(struct sAniSirGlobal *pMac,
+sir_convert_assoc_resp_frame2_struct(struct mac_context *pMac,
 				tpPESession session_entry,
 				uint8_t *frame, uint32_t len,
 				tpSirAssocRsp assoc);
 
 QDF_STATUS
-sir_convert_reassoc_req_frame2_struct(struct sAniSirGlobal *pMac,
+sir_convert_reassoc_req_frame2_struct(struct mac_context *pMac,
 				uint8_t *frame, uint32_t len,
 				tpSirAssocReq assoc);
 
 QDF_STATUS
-sir_parse_beacon_ie(struct sAniSirGlobal *pMac,
+sir_parse_beacon_ie(struct mac_context *pMac,
 		tpSirProbeRespBeacon pBeaconStruct,
 		uint8_t *pPayload, uint32_t payloadLength);
 
 QDF_STATUS
-sir_convert_beacon_frame2_struct(struct sAniSirGlobal *pMac,
+sir_convert_beacon_frame2_struct(struct mac_context *pMac,
 				uint8_t *pBeaconFrame,
 				tpSirProbeRespBeacon pBeaconStruct);
 
 QDF_STATUS
-sir_convert_auth_frame2_struct(struct sAniSirGlobal *pMac,
+sir_convert_auth_frame2_struct(struct mac_context *pMac,
 			uint8_t *frame, uint32_t len,
 			tpSirMacAuthFrameBody auth);
 
 QDF_STATUS
-sir_convert_addts_req2_struct(struct sAniSirGlobal *pMac,
+sir_convert_addts_req2_struct(struct mac_context *pMac,
 			uint8_t *frame, uint32_t len,
 			tSirAddtsReqInfo *addTs);
 
 QDF_STATUS
-sir_convert_addts_rsp2_struct(struct sAniSirGlobal *pMac,
+sir_convert_addts_rsp2_struct(struct mac_context *pMac,
 			uint8_t *frame, uint32_t len,
 			tSirAddtsRspInfo *addts);
 
 QDF_STATUS
-sir_convert_delts_req2_struct(struct sAniSirGlobal *pMac,
+sir_convert_delts_req2_struct(struct mac_context *pMac,
 			uint8_t *frame, uint32_t len,
 			tSirDeltsReqInfo *delTs);
 QDF_STATUS
@@ -639,11 +639,11 @@ sir_convert_qos_map_configure_frame2_struct(tpAniSirGlobal pMac,
 
 #ifdef ANI_SUPPORT_11H
 QDF_STATUS
-sir_convert_tpc_req_frame2_struct(struct sAniSirGlobal *, uint8_t *,
+sir_convert_tpc_req_frame2_struct(struct mac_context *, uint8_t *,
 				tpSirMacTpcReqActionFrame, uint32_t);
 
 QDF_STATUS
-sir_convert_meas_req_frame2_struct(struct sAniSirGlobal *, uint8_t *,
+sir_convert_meas_req_frame2_struct(struct mac_context *, uint8_t *,
 				tpSirMacMeasReqActionFrame, uint32_t);
 #endif
 

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

@@ -2210,7 +2210,7 @@ static void lim_process_normal_hdd_msg(tpAniSirGlobal mac_ctx,
 }
 
 void
-handle_ht_capabilityand_ht_info(struct sAniSirGlobal *pMac,
+handle_ht_capabilityand_ht_info(struct mac_context *pMac,
 				tpPESession psessionEntry)
 {
 	struct mlme_ht_capabilities_info *ht_cap_info;

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

@@ -3715,7 +3715,7 @@ __lim_process_sme_get_statistics_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 }
 #else
 static void __lim_process_sme_get_statistics_request(
-			struct sAniSirGlobal *mac_ctx, uint32_t *pMsgBuf) {}
+			struct mac_context *mac_ctx, uint32_t *pMsgBuf) {}
 #endif
 
 #ifdef FEATURE_WLAN_ESE

core/mac/src/pe/lim/lim_types.h

@@ -433,7 +433,7 @@ void lim_process_mlm_start_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf);
 void lim_get_random_bssid(tpAniSirGlobal pMac, uint8_t *data);
 
 /* Function to handle HT and HT IE CFG parameter intializations */
-void handle_ht_capabilityand_ht_info(struct sAniSirGlobal *pMac,
+void handle_ht_capabilityand_ht_info(struct mac_context *pMac,
 				     tpPESession psessionEntry);
 
 void lim_handle_param_update(tpAniSirGlobal pMac, eUpdateIEsType cfgId);

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

@@ -2085,7 +2085,7 @@ void lim_process_channel_switch_timeout(tpAniSirGlobal pMac)
  * Return: none
  */
 void
-lim_update_channel_switch(struct sAniSirGlobal *mac_ctx,
+lim_update_channel_switch(struct mac_context *mac_ctx,
 			tpSirProbeRespBeacon beacon,
 			tpPESession psession_entry)
 {

core/mac/src/pe/lim/lim_utils.h

@@ -314,7 +314,7 @@ void limUpdateStaRunTimeHTSwtichChnlParams(tpAniSirGlobal pMac,
 		uint8_t bssIdx);
 void lim_update_sta_run_time_ht_capability(tpAniSirGlobal pMac,
 		tDot11fIEHTCaps *pHTCaps);
-void lim_update_sta_run_time_ht_info(struct sAniSirGlobal *pMac,
+void lim_update_sta_run_time_ht_info(struct mac_context *pMac,
 		tDot11fIEHTInfo *pRcvdHTInfo,
 		tpPESession psessionEntry);
 void lim_cancel_dot11h_channel_switch(tpAniSirGlobal pMac,

core/mac/src/sys/legacy/src/system/inc/sys_startup.h

@@ -37,9 +37,19 @@
 
 /* Function */
 
-void sysMACCleanup(void *);
-QDF_STATUS sys_bbt_process_message_core(struct sAniSirGlobal *,
-					struct scheduler_msg *,
-					uint32_t, uint32_t);
+/**
+ * sys_bbt_process_message_core() - to process BBT messages
+ * @mac_ctx: pointer to mac context
+ * @msg: message pointer
+ * @type: type of persona
+ * @subtype: subtype of persona
+ *
+ * This routine is to process some bbt messages
+ *
+ * Return: None
+ */
+QDF_STATUS sys_bbt_process_message_core(struct mac_context *mac_ctx,
+					struct scheduler_msg *msg,
+					uint32_t type, uint32_t subtype);
 
 #endif /* __SYSSTARTUP_H */

core/mac/src/sys/legacy/src/system/src/sys_entry_func.c

@@ -72,20 +72,9 @@ QDF_STATUS sys_init_globals(tpAniSirGlobal pMac)
 	return QDF_STATUS_SUCCESS;
 }
 
-/**
- * sys_bbt_process_message_core() - to process BBT messages
- * @mac_ctx: pointer to mac context
- * @msg: message pointer
- * @type: type of persona
- * @subtype: subtype of persona
- *
- * This routine is to process some bbt messages
- *
- * Return: None
- */
-QDF_STATUS
-sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, struct scheduler_msg *msg,
-		uint32_t type, uint32_t subtype)
+QDF_STATUS sys_bbt_process_message_core(struct mac_context *mac_ctx,
+					struct scheduler_msg *msg,
+					uint32_t type, uint32_t subtype)
 {
 	uint32_t framecount;
 	QDF_STATUS ret;

core/sme/inc/csr_internal.h

@@ -1276,46 +1276,46 @@ QDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx,
 		uint32_t session_id);
 QDF_STATUS csr_get_channels_and_power(tpAniSirGlobal pMac);
 
-void csr_nonscan_pending_ll_unlock(struct sAniSirGlobal *mac_ctx);
-void csr_nonscan_active_ll_unlock(struct sAniSirGlobal *mac_ctx);
-void csr_nonscan_pending_ll_lock(struct sAniSirGlobal *mac_ctx);
-void csr_nonscan_active_ll_lock(struct sAniSirGlobal *mac_ctx);
+void csr_nonscan_pending_ll_unlock(struct mac_context *mac_ctx);
+void csr_nonscan_active_ll_unlock(struct mac_context *mac_ctx);
+void csr_nonscan_pending_ll_lock(struct mac_context *mac_ctx);
+void csr_nonscan_active_ll_lock(struct mac_context *mac_ctx);
 bool csr_nonscan_active_ll_is_list_empty(
-			struct sAniSirGlobal *mac_ctx,
+			struct mac_context *mac_ctx,
 			bool inter_locked);
 bool csr_nonscan_pending_ll_is_list_empty(
-			struct sAniSirGlobal *mac_ctx,
+			struct mac_context *mac_ctx,
 			bool inter_locked);
 bool csr_nonscan_active_ll_remove_entry(
-			struct sAniSirGlobal *mac_ctx,
+			struct mac_context *mac_ctx,
 			tListElem *pEntryToRemove, bool inter_locked);
 tListElem *csr_nonscan_active_ll_peek_head(
-			struct sAniSirGlobal *mac_ctx,
+			struct mac_context *mac_ctx,
 			bool inter_locked);
 tListElem *csr_nonscan_pending_ll_peek_head(
-			struct sAniSirGlobal *mac_ctx,
+			struct mac_context *mac_ctx,
 			bool inter_locked);
 tListElem *csr_nonscan_active_ll_remove_head(
-			struct sAniSirGlobal *mac_ctx,
+			struct mac_context *mac_ctx,
 			bool inter_locked);
 tListElem *csr_nonscan_pending_ll_remove_head(
-			struct sAniSirGlobal *mac_ctx,
+			struct mac_context *mac_ctx,
 			bool inter_locked);
 uint32_t csr_nonscan_pending_ll_count(
-			struct sAniSirGlobal *mac_ctx);
+			struct mac_context *mac_ctx);
 void csr_nonscan_pending_ll_insert_head(
-			struct sAniSirGlobal *mac_ctx,
+			struct mac_context *mac_ctx,
 		tListElem *entry, bool inter_locked);
 void csr_nonscan_pending_ll_insert_tail(
-			struct sAniSirGlobal *mac_ctx,
+			struct mac_context *mac_ctx,
 		tListElem *entry, bool inter_locked);
 uint32_t csr_nonscan_active_ll_count(
-			struct sAniSirGlobal *mac_ctx);
+			struct mac_context *mac_ctx);
 void csr_nonscan_active_ll_insert_head(
-			struct sAniSirGlobal *mac_ctx,
+			struct mac_context *mac_ctx,
 		tListElem *entry, bool inter_locked);
 tListElem *csr_nonscan_pending_ll_next(
-			struct sAniSirGlobal *mac_ctx,
+			struct mac_context *mac_ctx,
 		tListElem *entry, bool inter_locked);
 
 /**
@@ -1326,7 +1326,7 @@ tListElem *csr_nonscan_pending_ll_next(
  *
  * Return : none
  */
-void csr_purge_vdev_pending_ser_cmd_list(struct sAniSirGlobal *mac_ctx,
+void csr_purge_vdev_pending_ser_cmd_list(struct mac_context *mac_ctx,
 					 uint32_t vdev_id);
 
 /**
@@ -1337,7 +1337,7 @@ void csr_purge_vdev_pending_ser_cmd_list(struct sAniSirGlobal *mac_ctx,
  *
  * Return : none
  */
-void csr_purge_vdev_all_ser_cmd_list(struct sAniSirGlobal *mac_ctx,
+void csr_purge_vdev_all_ser_cmd_list(struct mac_context *mac_ctx,
 				     uint32_t vdev_id);
 
 /**
@@ -1348,7 +1348,7 @@ void csr_purge_vdev_all_ser_cmd_list(struct sAniSirGlobal *mac_ctx,
  *
  * Return : none
  */
-void csr_purge_vdev_all_scan_ser_cmd_list(struct sAniSirGlobal *mac_ctx,
+void csr_purge_vdev_all_scan_ser_cmd_list(struct mac_context *mac_ctx,
 					  uint32_t vdev_id);
 
 /**
@@ -1358,7 +1358,7 @@ void csr_purge_vdev_all_scan_ser_cmd_list(struct sAniSirGlobal *mac_ctx,
  *
  * Return : none
  */
-void csr_purge_pdev_all_ser_cmd_list(struct sAniSirGlobal *mac_ctx);
+void csr_purge_pdev_all_ser_cmd_list(struct mac_context *mac_ctx);
 
 bool csr_wait_for_connection_update(tpAniSirGlobal mac,
 		bool do_release_reacquire_lock);

core/sme/src/csr/csr_api_roam.c

@@ -571,14 +571,14 @@ static void csr_roam_de_init_globals(tpAniSirGlobal pMac)
 }
 
 #ifdef QCA_SUPPORT_CP_STATS
-static QDF_STATUS csr_open_stats_ll(struct sAniSirGlobal *mac_ctx)
+static QDF_STATUS csr_open_stats_ll(struct mac_context *mac_ctx)
 {
 	return QDF_STATUS_SUCCESS;
 }
 
-static void csr_close_stats_ll(struct sAniSirGlobal *mac_ctx) {}
+static void csr_close_stats_ll(struct mac_context *mac_ctx) {}
 #else
-static QDF_STATUS csr_open_stats_ll(struct sAniSirGlobal *mac_ctx)
+static QDF_STATUS csr_open_stats_ll(struct mac_context *mac_ctx)
 {
 	QDF_STATUS status;
 
@@ -589,7 +589,7 @@ static QDF_STATUS csr_open_stats_ll(struct sAniSirGlobal *mac_ctx)
 	return csr_ll_open(&mac_ctx->roam.peStatsReqList);
 }
 
-static void csr_close_stats_ll(struct sAniSirGlobal *mac_ctx)
+static void csr_close_stats_ll(struct mac_context *mac_ctx)
 {
 	csr_ll_close(&mac_ctx->roam.statsClientReqList);
 	csr_ll_close(&mac_ctx->roam.peStatsReqList);
@@ -1214,9 +1214,9 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac)
 }
 
 #ifdef QCA_SUPPORT_CP_STATS
-static void csr_init_tl_stats(struct sAniSirGlobal *mac_ctx) {}
+static void csr_init_tl_stats(struct mac_context *mac_ctx) {}
 #else
-static void csr_init_tl_stats(struct sAniSirGlobal *mac_ctx)
+static void csr_init_tl_stats(struct mac_context *mac_ctx)
 {
 	mac_ctx->roam.tlStatsReqInfo.numClient = 0;
 }

core/sme/src/csr/csr_util.c

@@ -409,7 +409,7 @@ const char *csr_phy_mode_str(eCsrPhyMode phy_mode)
 	}
 }
 
-void csr_purge_vdev_pending_ser_cmd_list(struct sAniSirGlobal *mac_ctx,
+void csr_purge_vdev_pending_ser_cmd_list(struct mac_context *mac_ctx,
 					 uint32_t vdev_id)
 {
 	wlan_serialization_purge_cmd_list_by_vdev_id(mac_ctx->psoc, vdev_id,
@@ -417,7 +417,7 @@ void csr_purge_vdev_pending_ser_cmd_list(struct sAniSirGlobal *mac_ctx,
 						     true, false);
 }
 
-void csr_purge_vdev_all_ser_cmd_list(struct sAniSirGlobal *mac_ctx,
+void csr_purge_vdev_all_ser_cmd_list(struct mac_context *mac_ctx,
 				     uint32_t vdev_id)
 {
 	wlan_serialization_purge_cmd_list_by_vdev_id(mac_ctx->psoc, vdev_id,
@@ -425,7 +425,7 @@ void csr_purge_vdev_all_ser_cmd_list(struct sAniSirGlobal *mac_ctx,
 						     true, true);
 }
 
-void csr_purge_vdev_all_scan_ser_cmd_list(struct sAniSirGlobal *mac_ctx,
+void csr_purge_vdev_all_scan_ser_cmd_list(struct mac_context *mac_ctx,
 					  uint32_t vdev_id)
 {
 	wlan_serialization_purge_cmd_list_by_vdev_id(mac_ctx->psoc, vdev_id,
@@ -433,66 +433,67 @@ void csr_purge_vdev_all_scan_ser_cmd_list(struct sAniSirGlobal *mac_ctx,
 						     false, false);
 }
 
-void csr_purge_pdev_all_ser_cmd_list(struct sAniSirGlobal *mac_ctx)
+void csr_purge_pdev_all_ser_cmd_list(struct mac_context *mac_ctx)
 {
 	wlan_serialization_purge_cmd_list(mac_ctx->psoc, NULL, true, true,
 					  true, true, true);
 }
 
-void csr_nonscan_active_ll_insert_head(struct sAniSirGlobal *mac_ctx,
-			tListElem *entry, bool inter_locked)
+void csr_nonscan_active_ll_insert_head(struct mac_context *mac_ctx,
+				       tListElem *entry, bool inter_locked)
 {
 }
 
-void csr_nonscan_pending_ll_insert_head(struct sAniSirGlobal *mac_ctx,
-		tListElem *entry, bool inter_locked)
+void csr_nonscan_pending_ll_insert_head(struct mac_context *mac_ctx,
+					tListElem *entry, bool inter_locked)
 {
 }
 
-void csr_nonscan_pending_ll_insert_tail(struct sAniSirGlobal *mac_ctx,
-		tListElem *entry, bool inter_locked)
+void csr_nonscan_pending_ll_insert_tail(struct mac_context *mac_ctx,
+					tListElem *entry, bool inter_locked)
 {
 }
 
-void csr_nonscan_pending_ll_unlock(struct sAniSirGlobal *mac_ctx)
+void csr_nonscan_pending_ll_unlock(struct mac_context *mac_ctx)
 {
 }
 
-void csr_nonscan_active_ll_unlock(struct sAniSirGlobal *mac_ctx)
+void csr_nonscan_active_ll_unlock(struct mac_context *mac_ctx)
 {
 }
 
-void csr_nonscan_pending_ll_lock(struct sAniSirGlobal *mac_ctx)
+void csr_nonscan_pending_ll_lock(struct mac_context *mac_ctx)
 {
 }
 
-void csr_nonscan_active_ll_lock(struct sAniSirGlobal *mac_ctx)
+void csr_nonscan_active_ll_lock(struct mac_context *mac_ctx)
 {
 }
 
-uint32_t csr_nonscan_active_ll_count(struct sAniSirGlobal *mac_ctx)
+uint32_t csr_nonscan_active_ll_count(struct mac_context *mac_ctx)
 {
 	return wlan_serialization_get_active_list_count(mac_ctx->psoc, false);
 }
 
-uint32_t csr_nonscan_pending_ll_count(struct sAniSirGlobal *mac_ctx)
+uint32_t csr_nonscan_pending_ll_count(struct mac_context *mac_ctx)
 {
 	return wlan_serialization_get_pending_list_count(mac_ctx->psoc, false);
 }
 
-bool csr_nonscan_active_ll_is_list_empty(struct sAniSirGlobal *mac_ctx,
-				bool inter_locked)
+bool csr_nonscan_active_ll_is_list_empty(struct mac_context *mac_ctx,
+					 bool inter_locked)
 {
 	return !wlan_serialization_get_active_list_count(mac_ctx->psoc, false);
 }
-bool csr_nonscan_pending_ll_is_list_empty(struct sAniSirGlobal *mac_ctx,
-				bool inter_locked)
+
+bool csr_nonscan_pending_ll_is_list_empty(struct mac_context *mac_ctx,
+					  bool inter_locked)
 {
 	return !wlan_serialization_get_pending_list_count(mac_ctx->psoc, false);
 }
 
-tListElem *csr_nonscan_active_ll_peek_head(struct sAniSirGlobal *mac_ctx,
-		bool inter_locked)
+tListElem *csr_nonscan_active_ll_peek_head(struct mac_context *mac_ctx,
+					   bool inter_locked)
 {
 	struct wlan_serialization_command *cmd;
 	tSmeCmd *sme_cmd;
@@ -508,8 +509,8 @@ tListElem *csr_nonscan_active_ll_peek_head(struct sAniSirGlobal *mac_ctx,
 	return &sme_cmd->Link;
 }
 
-tListElem *csr_nonscan_pending_ll_peek_head(struct sAniSirGlobal *mac_ctx,
-		bool inter_locked)
+tListElem *csr_nonscan_pending_ll_peek_head(struct mac_context *mac_ctx,
+					    bool inter_locked)
 {
 	struct wlan_serialization_command *cmd;
 	tSmeCmd *sme_cmd;
@@ -524,8 +525,8 @@ tListElem *csr_nonscan_pending_ll_peek_head(struct sAniSirGlobal *mac_ctx,
 	return &sme_cmd->Link;
 }
 
-bool csr_nonscan_active_ll_remove_entry(struct sAniSirGlobal *mac_ctx,
-		tListElem *entry, bool inter_locked)
+bool csr_nonscan_active_ll_remove_entry(struct mac_context *mac_ctx,
+					tListElem *entry, bool inter_locked)
 {
 	tListElem *head;
 
@@ -536,20 +537,20 @@ bool csr_nonscan_active_ll_remove_entry(struct sAniSirGlobal *mac_ctx,
 	return false;
 }
 
-tListElem *csr_nonscan_active_ll_remove_head(struct sAniSirGlobal *mac_ctx,
-		bool inter_locked)
+tListElem *csr_nonscan_active_ll_remove_head(struct mac_context *mac_ctx,
+					     bool inter_locked)
 {
 	return csr_nonscan_active_ll_peek_head(mac_ctx, inter_locked);
 }
 
-tListElem *csr_nonscan_pending_ll_remove_head(struct sAniSirGlobal *mac_ctx,
-		bool inter_locked)
+tListElem *csr_nonscan_pending_ll_remove_head(struct mac_context *mac_ctx,
+					      bool inter_locked)
 {
 	return csr_nonscan_pending_ll_peek_head(mac_ctx, inter_locked);
 }
 
-tListElem *csr_nonscan_pending_ll_next(struct sAniSirGlobal *mac_ctx,
-				tListElem *entry, bool inter_locked)
+tListElem *csr_nonscan_pending_ll_next(struct mac_context *mac_ctx,
+				       tListElem *entry, bool inter_locked)
 {
 	tSmeCmd *sme_cmd;
 	struct wlan_serialization_command cmd, *tcmd;

core/wma/inc/wma.h

@@ -2199,7 +2199,7 @@ static inline bool wma_vdev_is_device_in_low_pwr_mode(uint8_t vdev_id)
 static inline
 QDF_STATUS wma_vdev_get_cfg_int(int cfg_id, int *value)
 {
-	struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE);
+	struct mac_context *mac = cds_get_context(QDF_MODULE_ID_PE);
 
 	*value = 0;
 

core/wma/src/wma_data.c

@@ -1066,7 +1066,7 @@ QDF_STATUS wma_set_mcc_channel_time_latency(tp_wma_handle wma,
 	uint32_t mcc_channel, uint32_t mcc_channel_time_latency)
 {
 	uint32_t cfg_val = 0;
-	struct sAniSirGlobal *pMac = NULL;
+	struct mac_context *pMac = NULL;
 	uint32_t channel1 = mcc_channel;
 	uint32_t chan1_freq = cds_chan_to_freq(channel1);
 
@@ -1129,7 +1129,7 @@ QDF_STATUS wma_set_mcc_channel_time_quota(tp_wma_handle wma,
 		uint32_t adapter_2_chan_number)
 {
 	uint32_t cfg_val = 0;
-	struct sAniSirGlobal *pMac = NULL;
+	struct mac_context *pMac = NULL;
 	uint32_t chan1_freq = cds_chan_to_freq(adapter_1_chan_number);
 	uint32_t chan2_freq = cds_chan_to_freq(adapter_2_chan_number);
 

core/wma/src/wma_dev_if.c

@@ -2328,7 +2328,7 @@ struct cdp_vdev *wma_vdev_attach(tp_wma_handle wma_handle,
 	struct cdp_pdev *txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	enum wlan_op_mode txrx_vdev_type;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE);
+	struct mac_context *mac = cds_get_context(QDF_MODULE_ID_PE);
 	uint32_t cfg_val;
 	QDF_STATUS ret;
 	struct mlme_ht_capabilities_info *ht_cap_info;
@@ -4601,7 +4601,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta)
 	uint32_t i, j;
 	uint16_t mcs_limit;
 	uint8_t *rate_pos;
-	struct sAniSirGlobal *mac = (struct sAniSirGlobal *)wma->mac_context;
+	struct mac_context *mac = (struct mac_context *)wma->mac_context;
 
 	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 

core/wma/src/wma_features.c

@@ -3532,7 +3532,7 @@ QDF_STATUS wma_process_rmc_action_period_ind(tp_wma_handle wma)
 	wmi_buf_t buf;
 	int32_t vdev_id;
 	wmi_rmc_set_action_period_cmd_fixed_param *p_rmc_cmd;
-	struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE);
+	struct mac_context *mac = cds_get_context(QDF_MODULE_ID_PE);
 
 	if (NULL == mac) {
 		WMA_LOGE("%s: MAC mac does not exist", __func__);

core/wma/src/wma_main.c

@@ -3097,7 +3097,7 @@ static void wma_get_phy_mode_cb(uint8_t chan, uint32_t chan_width,
 				uint32_t *phy_mode)
 {
 	uint32_t dot11_mode;
-	struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE);
+	struct mac_context *mac = cds_get_context(QDF_MODULE_ID_PE);
 
 	if (!mac) {
 		wma_err("MAC context is NULL");

core/wma/src/wma_mgmt.c

@@ -572,7 +572,7 @@ int wma_unified_bcntx_status_event_handler(void *handle,
  */
 #ifdef CONVERGED_P2P_ENABLE
 static inline void
-wma_get_go_probe_timeout(struct sAniSirGlobal *mac,
+wma_get_go_probe_timeout(struct mac_context *mac,
 			 uint32_t *max_inactive_time,
 			 uint32_t *max_unresponsive_time)
 {
@@ -596,7 +596,7 @@ wma_get_go_probe_timeout(struct sAniSirGlobal *mac,
 }
 #else
 static inline void
-wma_get_go_probe_timeout(struct sAniSirGlobal *mac,
+wma_get_go_probe_timeout(struct mac_context *mac,
 			 uint32_t *max_inactive_time,
 			 uint32_t *max_unresponsive_time)
 {
@@ -613,7 +613,7 @@ wma_get_go_probe_timeout(struct sAniSirGlobal *mac,
  * Return: none
  */
 static inline void
-wma_get_link_probe_timeout(struct sAniSirGlobal *mac,
+wma_get_link_probe_timeout(struct mac_context *mac,
 			   uint32_t sub_type,
 			   uint32_t *max_inactive_time,
 			   uint32_t *max_unresponsive_time)
@@ -686,7 +686,7 @@ void wma_set_vdev_mgmt_rate(tp_wma_handle wma, uint8_t vdev_id)
 	int ret;
 	uint32_t per_band_mgmt_tx_rate = 0;
 	enum cds_band_type band = 0;
-	struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE);
+	struct mac_context *mac = cds_get_context(QDF_MODULE_ID_PE);
 
 	if (NULL == mac) {
 		WMA_LOGE("%s: Failed to get mac", __func__);
@@ -754,7 +754,7 @@ void wma_set_vdev_mgmt_rate(tp_wma_handle wma, uint8_t vdev_id)
 void wma_set_sap_keepalive(tp_wma_handle wma, uint8_t vdev_id)
 {
 	uint32_t min_inactive_time, max_inactive_time, max_unresponsive_time;
-	struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE);
+	struct mac_context *mac = cds_get_context(QDF_MODULE_ID_PE);
 	QDF_STATUS status;
 
 	if (NULL == mac) {
@@ -803,7 +803,7 @@ void wma_set_sap_keepalive(tp_wma_handle wma, uint8_t vdev_id)
 void wma_set_sta_sa_query_param(tp_wma_handle wma,
 				  uint8_t vdev_id)
 {
-	struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE);
+	struct mac_context *mac = cds_get_context(QDF_MODULE_ID_PE);
 	uint8_t max_retries;
 	uint16_t retry_interval;
 
@@ -995,7 +995,7 @@ static void wma_mask_tx_ht_rate(tp_wma_handle wma, uint8_t *mcs_set)
 	uint32_t i, j;
 	uint16_t mcs_limit;
 	uint8_t *rate_pos = mcs_set;
-	struct sAniSirGlobal *mac = (struct sAniSirGlobal *)wma->mac_context;
+	struct mac_context *mac = (struct mac_context *)wma->mac_context;
 
 	/*
 	 * Get MCS limit from ini configure, and map it to rate parameters
@@ -1200,7 +1200,7 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 	struct wma_txrx_node *intr = NULL;
 	bool is_he;
 	QDF_STATUS status;
-	struct sAniSirGlobal *mac = (struct sAniSirGlobal *)wma->mac_context;
+	struct mac_context *mac = (struct mac_context *)wma->mac_context;
 
 	cmd = qdf_mem_malloc(sizeof(struct peer_assoc_params));
 	if (!cmd) {

core/wma/src/wma_power.c

@@ -554,7 +554,7 @@ static QDF_STATUS wma_set_force_sleep(tp_wma_handle wma,
 	QDF_STATUS ret;
 	uint32_t cfg_data_val = 0;
 	/* get mac to access CFG data base */
-	struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE);
+	struct mac_context *mac = cds_get_context(QDF_MODULE_ID_PE);
 	uint32_t rx_wake_policy;
 	uint32_t tx_wake_threshold;
 	uint32_t pspoll_count;

core/wma/src/wma_scan_roam.c

@@ -2648,7 +2648,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 					tSirRoamOffloadScanReq *roam_req)
 {
 	qdf_size_t val_len;
-	struct sAniSirGlobal *pMac = NULL;
+	struct mac_context *pMac = NULL;
 	tSirMacCapabilityInfo selfCaps;
 	uint32_t val = 0;
 	uint32_t nCfgValue;