diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index f4fd99a2a7d3..02b80ea8622f 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -2309,7 +2309,7 @@ pe_roam_synch_callback(struct mac_context *mac_ctx,
 	uint8_t session_id;
 	tpDphHashNode curr_sta_ds;
 	uint16_t aid;
-	tpAddBssParams add_bss_params;
+	struct bss_params *add_bss_params;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	uint16_t join_rsp_len;
 
@@ -2420,7 +2420,7 @@ pe_roam_synch_callback(struct mac_context *mac_ctx,
 	}
 
 	roam_sync_ind_ptr->add_bss_params =
-		(tpAddBssParams) ft_session_ptr->ftPEContext.pAddBssReq;
+		(struct bss_params *) ft_session_ptr->ftPEContext.pAddBssReq;
 	add_bss_params = ft_session_ptr->ftPEContext.pAddBssReq;
 	lim_delete_tdls_peers(mac_ctx, session_ptr);
 	curr_sta_ds = dph_lookup_hash_entry(mac_ctx, session_ptr->bssId, &aid,
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 82fd87f81a5e..1e2a167b9f2d 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -3425,7 +3425,7 @@ lim_del_bss(struct mac_context *mac, tpDphHashNode sta, uint16_t bss_idx,
  * Return : void
  */
 static void lim_update_vhtcaps_assoc_resp(struct mac_context *mac_ctx,
-		tpAddBssParams pAddBssParams,
+		struct bss_params *pAddBssParams,
 		tDot11fIEVHTCaps *vht_caps, struct pe_session *pe_session)
 {
 	pAddBssParams->staContext.vht_caps =
@@ -3487,7 +3487,7 @@ static void lim_update_vhtcaps_assoc_resp(struct mac_context *mac_ctx,
  * Return : void
  */
 static void lim_update_vht_oper_assoc_resp(struct mac_context *mac_ctx,
-		tpAddBssParams pAddBssParams,
+		struct bss_params *pAddBssParams,
 		tDot11fIEVHTOperation *vht_oper, struct pe_session *pe_session)
 {
 	if (vht_oper->chanWidth &&
@@ -3527,7 +3527,7 @@ void lim_sta_add_bss_update_ht_parameter(uint8_t bss_chan_id,
 					 tDot11fIEHTCaps* ht_cap,
 					 tDot11fIEHTInfo* ht_inf,
 					 bool chan_width_support,
-					 tpAddBssParams add_bss)
+					 struct bss_params *add_bss)
 {
 	if (!ht_cap->present)
 		return;
@@ -3601,7 +3601,7 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
 				   uint8_t updateEntry, struct pe_session *pe_session)
 {
 	struct scheduler_msg msgQ = {0};
-	tpAddBssParams pAddBssParams = NULL;
+	struct bss_params *pAddBssParams = NULL;
 	uint32_t retCode;
 	tpDphHashNode sta = NULL;
 	bool chan_width_support = false;
@@ -3616,7 +3616,7 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
 	vht_cap_info = &mac->mlme_cfg->vht_caps.vht_cap_info;
 
 	/* Package SIR_HAL_ADD_BSS_REQ message parameters */
-	pAddBssParams = qdf_mem_malloc(sizeof(tAddBssParams));
+	pAddBssParams = qdf_mem_malloc(sizeof(struct bss_params));
 	if (!pAddBssParams) {
 		retCode = QDF_STATUS_E_NOMEM;
 		goto returnFailure;
@@ -3624,7 +3624,7 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
 
 	qdf_mem_copy(pAddBssParams->bssId, bssDescription->bssId,
 		     sizeof(tSirMacAddr));
-	/* Fill in tAddBssParams self_mac_addr */
+	/* Fill in struct bss_params self_mac_addr */
 	qdf_mem_copy(pAddBssParams->self_mac_addr,
 		     pe_session->self_mac_addr, sizeof(tSirMacAddr));
 
@@ -4100,7 +4100,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat
 					     struct pe_session *pe_session)
 {
 	struct scheduler_msg msgQ = {0};
-	tpAddBssParams pAddBssParams = NULL;
+	struct bss_params *pAddBssParams = NULL;
 	uint32_t retCode;
 	tSchBeaconStruct *pBeaconStruct;
 	bool chan_width_support = false;
@@ -4119,7 +4119,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat
 		return QDF_STATUS_E_NOMEM;
 
 	/* Package SIR_HAL_ADD_BSS_REQ message parameters */
-	pAddBssParams = qdf_mem_malloc(sizeof(tAddBssParams));
+	pAddBssParams = qdf_mem_malloc(sizeof(struct bss_params));
 	if (!pAddBssParams) {
 		retCode = QDF_STATUS_E_NOMEM;
 		goto returnFailure;
@@ -4136,7 +4136,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat
 	qdf_mem_copy(pAddBssParams->bssId, bssDescription->bssId,
 		     sizeof(tSirMacAddr));
 
-	/* Fill in tAddBssParams self_mac_addr */
+	/* Fill in struct bss_params self_mac_addr */
 	qdf_mem_copy(pAddBssParams->self_mac_addr,
 		     pe_session->self_mac_addr, sizeof(tSirMacAddr));
 	pe_debug("sessionid: %d updateEntry = %d limsystemrole = %d",
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h
index da452b2b95b0..1651930d8b11 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.h
+++ b/core/mac/src/pe/lim/lim_assoc_utils.h
@@ -200,7 +200,7 @@ void lim_sta_add_bss_update_ht_parameter(uint8_t bss_chan_id,
 					 tDot11fIEHTCaps* ht_cap,
 					 tDot11fIEHTInfo* ht_inf,
 					 bool chan_width_support,
-					 tpAddBssParams add_bss);
+					 struct bss_params *add_bss);
 
 QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp,
 				   tpSchBeaconStruct pBeaconStruct,
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index 8906dff26345..22f6c0130f86 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -116,7 +116,7 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 		uint8_t updateEntry, struct pe_session *ft_session,
 		struct bss_description *bssDescription)
 {
-	tpAddBssParams pAddBssParams = NULL;
+	struct bss_params *pAddBssParams = NULL;
 	tAddStaParams *sta_ctx;
 	bool chan_width_support = false;
 	uint8_t bss_chan_id;
@@ -133,7 +133,7 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 		return;
 
 	/* Package SIR_HAL_ADD_BSS_REQ message parameters */
-	pAddBssParams = qdf_mem_malloc(sizeof(tAddBssParams));
+	pAddBssParams = qdf_mem_malloc(sizeof(struct bss_params));
 	if (!pAddBssParams) {
 		qdf_mem_free(pBeaconStruct);
 		return;
@@ -151,7 +151,7 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 	qdf_mem_copy(pAddBssParams->bssId, bssDescription->bssId,
 		     sizeof(tSirMacAddr));
 
-	/* Fill in tAddBssParams self_mac_addr */
+	/* Fill in struct bss_params self_mac_addr */
 	qdf_mem_copy(pAddBssParams->self_mac_addr, ft_session->self_mac_addr,
 		     sizeof(tSirMacAddr));
 
@@ -756,7 +756,7 @@ void lim_fill_ft_session(struct mac_context *mac,
  *------------------------------------------------------------------*/
 bool lim_process_ft_update_key(struct mac_context *mac, uint32_t *msg_buf)
 {
-	tAddBssParams *pAddBssParams;
+	struct bss_params *pAddBssParams;
 	tSirFTUpdateKeyInfo *pKeyInfo;
 	struct pe_session *pe_session;
 	uint8_t sessionId;
diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
index 0b4e01287a9c..4fdf329743e8 100644
--- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
+++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
@@ -1235,7 +1235,7 @@ void lim_ibss_add_bss_rsp_when_coalescing(struct mac_context *mac, void *msg,
 {
 	uint8_t infoLen;
 	struct new_bss_info newBssInfo;
-	tpAddBssParams pAddBss = msg;
+	struct bss_params *pAddBss = msg;
 	tpSirMacMgmtHdr pHdr = mac->lim.ibss_info.mac_hdr;
 	tpSchBeaconStruct pBeacon = mac->lim.ibss_info.beacon;
 
diff --git a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
index 2292482647ea..812529720bf8 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
@@ -388,7 +388,7 @@ void lim_process_sta_mlm_add_bss_rsp_ft(struct mac_context *mac,
 	tpDphHashNode sta = NULL;
 	tpAddStaParams pAddStaParams = NULL;
 	uint32_t listenInterval = MLME_CFG_LISTEN_INTERVAL;
-	tpAddBssParams pAddBssParams = (tpAddBssParams) limMsgQ->bodyptr;
+	struct bss_params *pAddBssParams = (struct bss_params *) limMsgQ->bodyptr;
 	uint32_t selfStaDot11Mode = 0;
 
 	/* Sanity Checks */
diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
index cbcc9fef9a5b..8fd06206f2bc 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
@@ -299,21 +299,21 @@ lim_mlm_add_bss(struct mac_context *mac_ctx,
 		tLimMlmStartReq *mlm_start_req, struct pe_session *session)
 {
 	struct scheduler_msg msg_buf = {0};
-	tpAddBssParams addbss_param = NULL;
+	struct bss_params *addbss_param = NULL;
 	struct wlan_mlme_qos *qos_aggr = &mac_ctx->mlme_cfg->qos_mlme_params;
 	uint32_t retcode;
 	bool is_ch_dfs = false;
 
 	/* Package WMA_ADD_BSS_REQ message parameters */
-	addbss_param = qdf_mem_malloc(sizeof(tAddBssParams));
+	addbss_param = qdf_mem_malloc(sizeof(struct bss_params));
 	if (!addbss_param)
 		return eSIR_SME_RESOURCES_UNAVAILABLE;
 
-	/* Fill in tAddBssParams members */
+	/* Fill in struct bss_params members */
 	qdf_mem_copy(addbss_param->bssId, mlm_start_req->bssId,
 		     sizeof(tSirMacAddr));
 
-	/* Fill in tAddBssParams self_mac_addr */
+	/* Fill in struct bss_params self_mac_addr */
 	qdf_mem_copy(addbss_param->self_mac_addr,
 		     session->self_mac_addr, sizeof(tSirMacAddr));
 
diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
index 161cb2a33862..37af1d162090 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
@@ -2040,7 +2040,7 @@ static void lim_process_ap_mlm_add_bss_rsp(struct mac_context *mac,
 	tLimMlmStartCnf mlmStartCnf;
 	struct pe_session *pe_session;
 	uint8_t isWepEnabled = false;
-	tpAddBssParams pAddBssParams = (tpAddBssParams) limMsgQ->bodyptr;
+	struct bss_params *pAddBssParams = (struct bss_params *) limMsgQ->bodyptr;
 
 	if (!pAddBssParams) {
 		pe_err("Encountered NULL Pointer");
@@ -2186,7 +2186,7 @@ lim_process_ibss_mlm_add_bss_rsp(struct mac_context *mac,
 				 struct pe_session *pe_session)
 {
 	tLimMlmStartCnf mlmStartCnf;
-	tpAddBssParams pAddBssParams = (tpAddBssParams) limMsgQ->bodyptr;
+	struct bss_params *pAddBssParams = (struct bss_params *) limMsgQ->bodyptr;
 
 	if (!pAddBssParams) {
 		pe_err("Invalid body pointer in message");
@@ -2283,7 +2283,7 @@ static void
 lim_process_sta_add_bss_rsp_pre_assoc(struct mac_context *mac_ctx,
 	struct scheduler_msg *msg, struct pe_session *session_entry)
 {
-	tpAddBssParams pAddBssParams = (tpAddBssParams) msg->bodyptr;
+	struct bss_params *pAddBssParams = (struct bss_params *) msg->bodyptr;
 	tAniAuthType cfgAuthType, authMode;
 	tLimMlmAuthReq *pMlmAuthReq;
 	tpDphHashNode sta = NULL;
@@ -2387,7 +2387,7 @@ static void
 lim_process_sta_mlm_add_bss_rsp(struct mac_context *mac_ctx,
 	struct scheduler_msg *msg, struct pe_session *session_entry)
 {
-	tpAddBssParams add_bss_params = (tpAddBssParams) msg->bodyptr;
+	struct bss_params *add_bss_params = (struct bss_params *) msg->bodyptr;
 	tLimMlmAssocCnf mlm_assoc_cnf;
 	uint32_t msg_type = LIM_MLM_ASSOC_CNF;
 	uint32_t sub_type = LIM_ASSOC;
@@ -2545,7 +2545,7 @@ void lim_process_mlm_add_bss_rsp(struct mac_context *mac_ctx,
 {
 	tLimMlmStartCnf mlm_start_cnf;
 	struct pe_session *session_entry;
-	tpAddBssParams add_bss_param = (tpAddBssParams) (msg->bodyptr);
+	struct bss_params *add_bss_param = (struct bss_params *) (msg->bodyptr);
 	enum bss_type bss_type;
 
 	if (!add_bss_param) {
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index f0f0d492717b..f6479dd76081 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -6736,7 +6736,7 @@ void lim_intersect_sta_he_caps(tpSirAssocReq assoc_req, struct pe_session *sessi
 		lim_intersect_he_caps(rcvd_he, session_he, peer_he);
 }
 
-void lim_intersect_ap_he_caps(struct pe_session *session, tpAddBssParams add_bss,
+void lim_intersect_ap_he_caps(struct pe_session *session, struct bss_params *add_bss,
 		tSchBeaconStruct *beacon, tpSirAssocRsp assoc_rsp)
 {
 	tDot11fIEhe_cap *rcvd_he;
@@ -6752,7 +6752,7 @@ void lim_intersect_ap_he_caps(struct pe_session *session, tpAddBssParams add_bss
 	add_bss->staContext.he_capable = true;
 }
 
-void lim_add_bss_he_cap(tpAddBssParams add_bss, tpSirAssocRsp assoc_rsp)
+void lim_add_bss_he_cap(struct bss_params *add_bss, tpSirAssocRsp assoc_rsp)
 {
 	tDot11fIEhe_cap *he_cap;
 	tDot11fIEhe_op *he_op;
@@ -6768,7 +6768,7 @@ void lim_add_bss_he_cap(tpAddBssParams add_bss, tpSirAssocRsp assoc_rsp)
 			     he_op, sizeof(*he_op));
 }
 
-void lim_add_bss_he_cfg(tpAddBssParams add_bss, struct pe_session *session)
+void lim_add_bss_he_cfg(struct bss_params *add_bss, struct pe_session *session)
 {
 	add_bss->he_sta_obsspd = session->he_sta_obsspd;
 }
@@ -6823,7 +6823,7 @@ void lim_update_usr_he_cap(struct mac_context *mac_ctx, struct pe_session *sessi
 		he_cap->su_beamformer, he_cap->su_beamformee, he_cap->mu_beamformer);
 }
 
-void lim_decide_he_op(struct mac_context *mac_ctx, tpAddBssParams add_bss,
+void lim_decide_he_op(struct mac_context *mac_ctx, struct bss_params *add_bss,
 		      struct pe_session *session)
 {
 	uint32_t val;
@@ -7144,7 +7144,7 @@ void lim_update_sta_he_capable(struct mac_context *mac,
 	pe_debug("he_capable: %d", add_sta_params->he_capable);
 }
 
-void lim_update_bss_he_capable(struct mac_context *mac, tpAddBssParams add_bss)
+void lim_update_bss_he_capable(struct mac_context *mac, struct bss_params *add_bss)
 {
 	add_bss->he_capable = true;
 	pe_debug("he_capable: %d", add_bss->he_capable);
diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h
index 9c0f053606a4..824ec9ca7cf0 100644
--- a/core/mac/src/pe/lim/lim_utils.h
+++ b/core/mac/src/pe/lim/lim_utils.h
@@ -922,7 +922,7 @@ QDF_STATUS lim_strip_ie(struct mac_context *mac_ctx,
  *
  * Return: None
  */
-void lim_intersect_ap_he_caps(struct pe_session *session, tpAddBssParams add_bss,
+void lim_intersect_ap_he_caps(struct pe_session *session, struct bss_params *add_bss,
 		tSchBeaconStruct *pBeaconStruct, tpSirAssocRsp assoc_rsp);
 
 /**
@@ -961,7 +961,7 @@ void lim_add_self_he_cap(tpAddStaParams add_sta_params, struct pe_session *sessi
  *
  * Return: None
  */
-void lim_add_bss_he_cap(tpAddBssParams add_bss, tpSirAssocRsp assoc_rsp);
+void lim_add_bss_he_cap(struct bss_params *add_bss, tpSirAssocRsp assoc_rsp);
 
 /**
  * lim_add_bss_he_cfg() - Set HE config to BSS params
@@ -970,7 +970,7 @@ void lim_add_bss_he_cap(tpAddBssParams add_bss, tpSirAssocRsp assoc_rsp);
  *
  * Return: None
  */
-void lim_add_bss_he_cfg(tpAddBssParams add_bss, struct pe_session *session);
+void lim_add_bss_he_cfg(struct bss_params *add_bss, struct pe_session *session);
 
 /**
  * lim_copy_bss_he_cap() - Copy HE capability into PE session from start bss
@@ -1061,7 +1061,7 @@ void lim_update_usr_he_cap(struct mac_context *mac_ctx, struct pe_session *sessi
  * Parse the HE Operation IE and populate the fields to be
  * sent to FW as part of add bss.
  */
-void lim_decide_he_op(struct mac_context *mac_ctx, tpAddBssParams add_bss,
+void lim_decide_he_op(struct mac_context *mac_ctx, struct bss_params *add_bss,
 		struct pe_session *session);
 
 /**
@@ -1105,7 +1105,7 @@ static inline bool lim_is_sta_he_capable(tpDphHashNode sta_ds)
  *
  * Return: None
  */
-void lim_update_bss_he_capable(struct mac_context *mac, tpAddBssParams add_bss);
+void lim_update_bss_he_capable(struct mac_context *mac, struct bss_params *add_bss);
 
 /**
  * lim_update_stads_he_capable() - Update he_capable in sta ds context
@@ -1188,19 +1188,19 @@ static inline void lim_add_self_he_cap(tpAddStaParams add_sta_params,
 {
 }
 
-static inline void lim_add_bss_he_cap(tpAddBssParams add_bss,
+static inline void lim_add_bss_he_cap(struct bss_params *add_bss,
 				      tpSirAssocRsp assoc_rsp)
 {
 	return;
 }
 
-static inline void lim_add_bss_he_cfg(tpAddBssParams add_bss,
+static inline void lim_add_bss_he_cfg(struct bss_params *add_bss,
 					 struct pe_session *session)
 {
 }
 
 static inline void lim_intersect_ap_he_caps(struct pe_session *session,
-		tpAddBssParams add_bss,	tSchBeaconStruct *pBeaconStruct,
+		struct bss_params *add_bss,	tSchBeaconStruct *pBeaconStruct,
 		tpSirAssocRsp assoc_rsp)
 {
 	return;
@@ -1223,7 +1223,7 @@ static inline void lim_update_usr_he_cap(struct mac_context *mac_ctx,
 }
 
 static inline void lim_decide_he_op(struct mac_context *mac_ctx,
-			tpAddBssParams add_bss, struct pe_session *session)
+			struct bss_params *add_bss, struct pe_session *session)
 {
 }
 
@@ -1270,7 +1270,7 @@ static inline bool lim_is_sta_he_capable(tpDphHashNode sta_ds)
 }
 
 static inline void lim_update_bss_he_capable(struct mac_context *mac,
-			tpAddBssParams add_bss)
+			struct bss_params *add_bss)
 {
 }
 
diff --git a/core/mac/src/pe/nan/nan_datapath.c b/core/mac/src/pe/nan/nan_datapath.c
index 6ee1dd7e31ed..ee443dd7e80b 100644
--- a/core/mac/src/pe/nan/nan_datapath.c
+++ b/core/mac/src/pe/nan/nan_datapath.c
@@ -350,7 +350,7 @@ void lim_process_ndi_mlm_add_bss_rsp(struct mac_context *mac_ctx,
 				     struct pe_session *session_entry)
 {
 	tLimMlmStartCnf mlm_start_cnf;
-	tpAddBssParams add_bss_params = (tpAddBssParams) lim_msgq->bodyptr;
+	struct bss_params *add_bss_params = (struct bss_params *) lim_msgq->bodyptr;
 
 	if (!add_bss_params) {
 		pe_err("Invalid body pointer in message");
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 26b4db714009..a46d14589095 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -21001,7 +21001,7 @@ static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx,
 	struct csr_roam_info *roam_info;
 	tCsrRoamConnectedProfile *conn_profile = NULL;
 	sme_QosAssocInfo assoc_info;
-	tpAddBssParams add_bss_params;
+	struct bss_params *add_bss_params;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tPmkidCacheInfo pmkid_cache;
 	uint32_t pmkid_index;
@@ -21320,7 +21320,7 @@ static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx,
 	}
 	conn_profile->vht_channel_width =
 		roam_synch_data->join_rsp->vht_channel_width;
-	add_bss_params = (tpAddBssParams)roam_synch_data->add_bss_params;
+	add_bss_params = (struct bss_params *)roam_synch_data->add_bss_params;
 	session->connectedInfo.staId = add_bss_params->staContext.staIdx;
 	roam_info->staId = session->connectedInfo.staId;
 	roam_info->timingMeasCap =
diff --git a/core/wma/inc/wma_he.h b/core/wma/inc/wma_he.h
index 16cfc7d959e6..78c9ca53f376 100644
--- a/core/wma/inc/wma_he.h
+++ b/core/wma/inc/wma_he.h
@@ -133,7 +133,7 @@ void wma_populate_peer_he_cap(struct peer_assoc_params *peer,
  * Return: None
  */
 void wma_update_vdev_he_ops(struct wma_vdev_start_req *req,
-		tpAddBssParams add_bss);
+		struct bss_params *add_bss);
 
 /**
  * wma_copy_vdev_start_he_ops() - copy HE ops from vdev start req to vdev start
@@ -165,7 +165,7 @@ void wma_vdev_set_he_bss_params(tp_wma_handle wma, uint8_t vdev_id,
  * Return: None
  */
 void wma_vdev_set_he_config(tp_wma_handle wma, uint8_t vdev_id,
-				tpAddBssParams add_bss);
+				struct bss_params *add_bss);
 
 static inline bool wma_is_peer_he_capable(tpAddStaParams params)
 {
@@ -274,7 +274,7 @@ static inline void wma_populate_peer_he_cap(struct peer_assoc_params *peer,
 }
 
 static inline void wma_update_vdev_he_ops(struct wma_vdev_start_req *req,
-			tpAddBssParams add_bss)
+			struct bss_params *add_bss)
 {
 }
 
@@ -295,7 +295,7 @@ static inline void wma_vdev_set_he_bss_params(tp_wma_handle wma,
 }
 
 static inline void wma_vdev_set_he_config(tp_wma_handle wma, uint8_t vdev_id,
-					tpAddBssParams add_bss)
+					struct bss_params *add_bss)
 {
 }
 
diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h
index 240d084aa26a..00928f78c003 100644
--- a/core/wma/inc/wma_if.h
+++ b/core/wma/inc/wma_if.h
@@ -367,7 +367,7 @@ typedef struct sLimMlmSetKeysReq {
 } tLimMlmSetKeysReq, *tpLimMlmSetKeysReq;
 
 /**
- * struct tAddBssParams - parameters required for add bss params
+ * struct struct bss_params - parameters required for add bss params
  * @bssId: MAC Address/BSSID
  * @self_mac_addr: Self Mac Address
  * @bssType: BSS type
@@ -418,7 +418,7 @@ typedef struct sLimMlmSetKeysReq {
  * @dfs_regdomain: dfs region
  * @no_ptk_4_way: Do not need 4-way handshake
  */
-typedef struct {
+struct bss_params {
 	tSirMacAddr bssId;
 	tSirMacAddr self_mac_addr;
 	enum bss_type bssType;
@@ -493,7 +493,7 @@ typedef struct {
 	uint32_t cac_duration_ms;
 	uint32_t dfs_regdomain;
 	bool no_ptk_4_way;
-} tAddBssParams, *tpAddBssParams;
+};
 
 /**
  * struct tDeleteBssParams - params required for del bss request
diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h
index 5e77e61653fa..053a47df9c63 100644
--- a/core/wma/inc/wma_internal.h
+++ b/core/wma/inc/wma_internal.h
@@ -679,7 +679,7 @@ struct wma_target_req *wma_fill_hold_req(tp_wma_handle wma,
 void wma_remove_vdev_req(tp_wma_handle wma, uint8_t vdev_id,
 				uint8_t type);
 
-void wma_add_bss(tp_wma_handle wma, tpAddBssParams params);
+void wma_add_bss(tp_wma_handle wma, struct bss_params *params);
 
 void wma_add_sta(tp_wma_handle wma, tpAddStaParams add_sta);
 
@@ -881,7 +881,7 @@ QDF_STATUS wma_set_smps_params(tp_wma_handle wma, uint8_t vdev_id,
  */
 
 void wma_set_bss_rate_flags(tp_wma_handle wma, uint8_t vdev_id,
-			    tpAddBssParams add_bss);
+			    struct bss_params *add_bss);
 
 int32_t wmi_unified_send_txbf(tp_wma_handle wma, tpAddStaParams params);
 
@@ -1586,7 +1586,7 @@ QDF_STATUS wma_get_roam_scan_stats(WMA_HANDLE handle,
  *
  * Return: None;
  */
-void wma_remove_peer_on_add_bss_failure(tpAddBssParams add_bss_params);
+void wma_remove_peer_on_add_bss_failure(struct bss_params *add_bss_params);
 
 /**
  * wma_roam_scan_stats_event_handler() - roam scan stats event handler
diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c
index 244c1e02ce86..3a8a1645fffc 100644
--- a/core/wma/src/wma_data.c
+++ b/core/wma/src/wma_data.c
@@ -764,7 +764,7 @@ static void wma_cp_stats_set_rate_flag(tp_wma_handle wma, uint8_t vdev_id)
  * Return: none
  */
 void wma_set_bss_rate_flags(tp_wma_handle wma, uint8_t vdev_id,
-			    tpAddBssParams add_bss)
+			    struct bss_params *add_bss)
 {
 	struct wma_txrx_node *iface = &wma->interfaces[vdev_id];
 
diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index ca9bbe023084..6aab9d688751 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -978,7 +978,7 @@ send_rsp:
  * Return: none
  */
 static void wma_send_start_resp(tp_wma_handle wma,
-				tpAddBssParams add_bss,
+				struct bss_params *add_bss,
 				wmi_vdev_start_response_event_fixed_param *
 				resp_event)
 {
@@ -1018,7 +1018,7 @@ static void wma_send_start_resp(tp_wma_handle wma,
  * Return: none
  */
 static void wma_vdev_start_rsp(tp_wma_handle wma,
-			       tpAddBssParams add_bss,
+			       struct bss_params *add_bss,
 			       wmi_vdev_start_response_event_fixed_param *
 			       resp_event)
 {
@@ -1368,7 +1368,7 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info,
 		if (QDF_IS_STATUS_ERROR(status))
 			return -EINVAL;
 	} else if (req_msg->msg_type == WMA_ADD_BSS_REQ) {
-		tpAddBssParams bssParams = (tpAddBssParams) req_msg->user_data;
+		struct bss_params *bssParams = (struct bss_params *) req_msg->user_data;
 
 		qdf_mem_copy(iface->bssid, bssParams->bssId,
 				QDF_MAC_ADDR_SIZE);
@@ -3271,7 +3271,7 @@ int wma_peer_assoc_conf_handler(void *handle, uint8_t *cmd_param_info,
 		wma_send_msg_high_priority(wma, WMA_ADD_STA_RSP,
 					   (void *)params, 0);
 	} else if (req_msg->msg_type == WMA_ADD_BSS_REQ) {
-		tpAddBssParams  params = (tpAddBssParams) req_msg->user_data;
+		struct bss_params * params = (struct bss_params *) req_msg->user_data;
 
 		if (!params) {
 			WMA_LOGE(FL("add BSS params is NULL for vdev %d"),
@@ -3442,7 +3442,7 @@ void wma_hold_req_timer(void *data)
 		wma_send_msg_high_priority(wma, WMA_ADD_STA_RSP,
 					   (void *)params, 0);
 	} else if (tgt_req->msg_type == WMA_ADD_BSS_REQ) {
-		tpAddBssParams  params = (tpAddBssParams) tgt_req->user_data;
+		struct bss_params * params = (struct bss_params *) tgt_req->user_data;
 
 		params->status = QDF_STATUS_E_TIMEOUT;
 		WMA_LOGA(FL("WMA_ADD_BSS_REQ timed out"));
@@ -3662,7 +3662,7 @@ static void
 wma_handle_add_bss_req_timeout(tp_wma_handle wma, struct wma_target_req *req)
 {
 	struct wma_txrx_node *iface;
-	tpAddBssParams params = (tpAddBssParams)req->user_data;
+	struct bss_params *params = (struct bss_params *)req->user_data;
 
 	params->status = QDF_STATUS_E_TIMEOUT;
 	WMA_LOGA("%s: WMA_ADD_BSS_REQ timedout", __func__);
@@ -4030,7 +4030,7 @@ static inline void wma_set_mgmt_frame_protection(tp_wma_handle wma)
  *
  * Return: none
  */
-static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss)
+static void wma_add_bss_ap_mode(tp_wma_handle wma, struct bss_params *add_bss)
 {
 	struct cdp_pdev *pdev;
 	struct cdp_vdev *vdev;
@@ -4159,7 +4159,7 @@ send_fail_resp:
  *
  * Return: none
  */
-static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss)
+static void wma_add_bss_ibss_mode(tp_wma_handle wma, struct bss_params *add_bss)
 {
 	struct cdp_pdev *pdev;
 	struct cdp_vdev *vdev;
@@ -4310,7 +4310,7 @@ send_fail_resp:
  *
  * Return: none
  */
-static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss)
+static void wma_add_bss_sta_mode(tp_wma_handle wma, struct bss_params *add_bss)
 {
 	struct cdp_pdev *pdev;
 	struct wma_vdev_start_req req;
@@ -4608,7 +4608,7 @@ send_fail_resp:
  *
  * Return: none
  */
-void wma_add_bss(tp_wma_handle wma, tpAddBssParams params)
+void wma_add_bss(tp_wma_handle wma, struct bss_params *params)
 {
 	WMA_LOGD("%s: add_bss_param.halPersona = %d",
 		 __func__, params->halPersona);
diff --git a/core/wma/src/wma_he.c b/core/wma/src/wma_he.c
index 1227e0ad1709..b1804692423e 100644
--- a/core/wma/src/wma_he.c
+++ b/core/wma/src/wma_he.c
@@ -1280,7 +1280,7 @@ void wma_populate_peer_he_cap(struct peer_assoc_params *peer,
 }
 
 void wma_update_vdev_he_ops(struct wma_vdev_start_req *req,
-		tpAddBssParams add_bss)
+		struct bss_params *add_bss)
 {
 	uint32_t he_ops = 0;
 	tDot11fIEhe_op *he_op = &add_bss->he_op;
@@ -1319,7 +1319,7 @@ void wma_vdev_set_he_bss_params(tp_wma_handle wma, uint8_t vdev_id,
 }
 
 void wma_vdev_set_he_config(tp_wma_handle wma, uint8_t vdev_id,
-				tpAddBssParams add_bss)
+				struct bss_params *add_bss)
 {
 	QDF_STATUS ret;
 	int8_t pd_min, pd_max, sec_ch_ed, tx_pwr;
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index 86d205a8d52b..1c3eaf589761 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -8468,7 +8468,7 @@ static QDF_STATUS wma_mc_process_msg(struct scheduler_msg *msg)
 				(tpSwitchChannelParams) msg->bodyptr);
 		break;
 	case WMA_ADD_BSS_REQ:
-		wma_add_bss(wma_handle, (tpAddBssParams) msg->bodyptr);
+		wma_add_bss(wma_handle, (struct bss_params *) msg->bodyptr);
 		break;
 	case WMA_ADD_STA_REQ:
 		wma_add_sta(wma_handle, (tpAddStaParams) msg->bodyptr);
diff --git a/core/wma/src/wma_nan_datapath.c b/core/wma/src/wma_nan_datapath.c
index 8c6d8edce8f1..3e817acaea9b 100644
--- a/core/wma/src/wma_nan_datapath.c
+++ b/core/wma/src/wma_nan_datapath.c
@@ -43,7 +43,7 @@
  * Sends VDEV_START command to firmware
  * Return: None
  */
-void wma_add_bss_ndi_mode(tp_wma_handle wma, tpAddBssParams add_bss)
+void wma_add_bss_ndi_mode(tp_wma_handle wma, struct bss_params *add_bss)
 {
 	struct cdp_pdev *pdev;
 	struct cdp_vdev *vdev;
diff --git a/core/wma/src/wma_nan_datapath.h b/core/wma/src/wma_nan_datapath.h
index c2aa1f395dc9..6f809f5e4c2e 100644
--- a/core/wma/src/wma_nan_datapath.h
+++ b/core/wma/src/wma_nan_datapath.h
@@ -61,7 +61,7 @@ static inline void wma_update_hdd_cfg_ndp(tp_wma_handle wma_handle,
 	tgt_cfg->nan_datapath_enabled = wma_handle->nan_datapath_enabled;
 }
 
-void wma_add_bss_ndi_mode(tp_wma_handle wma, tpAddBssParams add_bss);
+void wma_add_bss_ndi_mode(tp_wma_handle wma, struct bss_params *add_bss);
 
 void wma_delete_sta_req_ndi_mode(tp_wma_handle wma,
 					tpDeleteStaParams del_sta);
@@ -92,7 +92,7 @@ static inline void wma_update_hdd_cfg_ndp(tp_wma_handle wma_handle,
 }
 
 static inline void wma_add_bss_ndi_mode(tp_wma_handle wma,
-					tpAddBssParams add_bss)
+					struct bss_params *add_bss)
 {
 	return;
 }
diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c
index c5fd386688f7..a27e0f6a5c05 100644
--- a/core/wma/src/wma_scan_roam.c
+++ b/core/wma/src/wma_scan_roam.c
@@ -2667,7 +2667,7 @@ wma_roam_update_vdev(tp_wma_handle wma,
 	/* Update new peer's uc cipher */
 	wma_update_roamed_peer_unicast_cipher(wma, uc_cipher, cipher_cap,
 					      roam_synch_ind_ptr->bssid.bytes);
-	wma_add_bss(wma, (tpAddBssParams)roam_synch_ind_ptr->add_bss_params);
+	wma_add_bss(wma, (struct bss_params *)roam_synch_ind_ptr->add_bss_params);
 	wma_add_sta(wma, add_sta_params);
 	qdf_mem_copy(wma->interfaces[vdev_id].bssid,
 			roam_synch_ind_ptr->bssid.bytes, QDF_MAC_ADDR_SIZE);
diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c
index 2005dc9012c9..d380c1b71bf9 100644
--- a/core/wma/src/wma_utils.c
+++ b/core/wma/src/wma_utils.c
@@ -3954,7 +3954,7 @@ QDF_STATUS wma_get_roam_scan_stats(WMA_HANDLE handle,
 	return QDF_STATUS_SUCCESS;
 }
 
-void wma_remove_peer_on_add_bss_failure(tpAddBssParams add_bss_params)
+void wma_remove_peer_on_add_bss_failure(struct bss_params *add_bss_params)
 {
 	tp_wma_handle wma;
 	struct cdp_pdev *pdev;
@@ -4049,7 +4049,7 @@ bool wma_get_channel_switch_in_progress(struct wma_txrx_node *iface)
 }
 
 static QDF_STATUS wma_vdev_send_start_resp(tp_wma_handle wma,
-					   tpAddBssParams add_bss)
+					   struct bss_params *add_bss)
 {
 	WMA_LOGD(FL("Sending add bss rsp to umac(vdev %d status %d)"),
 		 add_bss->bss_idx, add_bss->status);
@@ -4132,7 +4132,7 @@ QDF_STATUS wma_ap_mlme_vdev_start_continue(struct vdev_mlme_obj *vdev_mlme,
 		wma_send_msg(wma, WMA_HIDDEN_SSID_RESTART_RSP, data, 0);
 		ap_mlme_set_hidden_ssid_restart_in_progress(vdev, false);
 	} else {
-		status = wma_vdev_send_start_resp(wma, (tpAddBssParams)data);
+		status = wma_vdev_send_start_resp(wma, (struct bss_params *)data);
 	}
 
 	return status;
@@ -4205,7 +4205,7 @@ QDF_STATUS wma_ap_mlme_vdev_stop_start_send(struct vdev_mlme_obj *vdev_mlme,
 					    uint16_t data_len, void *data)
 {
 	tp_wma_handle wma;
-	tpAddBssParams bss_params = (tpAddBssParams)data;
+	struct bss_params *bss_params = (struct bss_params *)data;
 
 	wma = cds_get_context(QDF_MODULE_ID_WMA);
 	if (!wma) {