diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 6971107e29..de57a42710 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -1351,7 +1351,7 @@ typedef struct sSirSmeStopBssRsp {
 
 /* / Definition for Channel Switch indication for station */
 /* / MAC ---> */
-typedef struct sSirSmeSwitchChannelInd {
+struct switch_channel_ind {
 	uint16_t messageType;   /* eWNI_SME_SWITCH_CHL_IND */
 	uint16_t length;
 	uint8_t sessionId;
@@ -1359,7 +1359,7 @@ typedef struct sSirSmeSwitchChannelInd {
 	struct ch_params chan_params;
 	struct qdf_mac_addr bssid;      /* BSSID */
 	QDF_STATUS status;
-} tSirSmeSwitchChannelInd, *tpSirSmeSwitchChannelInd;
+};
 
 /* / Definition for MIC failure indication */
 /* / MAC ---> */
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index 42b1552a26..8d2350a5bb 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -2299,7 +2299,7 @@ void lim_switch_channel_cback(struct mac_context *mac, QDF_STATUS status,
 			      uint32_t *data, struct pe_session *pe_session)
 {
 	struct scheduler_msg mmhMsg = { 0 };
-	tSirSmeSwitchChannelInd *pSirSmeSwitchChInd;
+	struct switch_channel_ind *pSirSmeSwitchChInd;
 
 	pe_session->currentOperChannel = pe_session->currentReqChannel;
 
@@ -2311,12 +2311,12 @@ void lim_switch_channel_cback(struct mac_context *mac, QDF_STATUS status,
 	}
 
 	mmhMsg.type = eWNI_SME_SWITCH_CHL_IND;
-	pSirSmeSwitchChInd = qdf_mem_malloc(sizeof(tSirSmeSwitchChannelInd));
+	pSirSmeSwitchChInd = qdf_mem_malloc(sizeof(*pSirSmeSwitchChInd));
 	if (!pSirSmeSwitchChInd)
 		return;
 
 	pSirSmeSwitchChInd->messageType = eWNI_SME_SWITCH_CHL_IND;
-	pSirSmeSwitchChInd->length = sizeof(tSirSmeSwitchChannelInd);
+	pSirSmeSwitchChInd->length = sizeof(*pSirSmeSwitchChInd);
 	pSirSmeSwitchChInd->newChannelId =
 		pe_session->gLimChannelSwitch.primaryChannel;
 	pSirSmeSwitchChInd->sessionId = pe_session->smeSessionId;
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index a0baeadf89..6821472e09 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -10907,14 +10907,14 @@ csr_roam_chk_lnk_swt_ch_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 	uint32_t sessionId = CSR_SESSION_ID_INVALID;
 	uint16_t ie_len;
 	QDF_STATUS status;
-	tpSirSmeSwitchChannelInd pSwitchChnInd;
+	struct switch_channel_ind *pSwitchChnInd;
 	struct csr_roam_info roamInfo;
 	tSirMacDsParamSetIE *ds_params_ie;
 	tDot11fIEHTInfo *ht_info_ie;
 
 	/* in case of STA, the SWITCH_CHANNEL originates from its AP */
 	sme_debug("eWNI_SME_SWITCH_CHL_IND from SME");
-	pSwitchChnInd = (tpSirSmeSwitchChannelInd) msg_ptr;
+	pSwitchChnInd = (struct switch_channel_ind *)msg_ptr;
 	/* Update with the new channel id. The channel id is hidden in the
 	 * statusCode.
 	 */