Browse Source

qcacld-3.0: Replace typedef tSirSmeSwitchChannelInd

The Linux Coding Style enumerates a few special cases where typedefs
are useful, but stresses "NEVER EVER use a typedef unless you can
clearly match one of those rules." The tSirSmeSwitchChannelInd typedef
does not meet any of those criteria, so replace it (and the "tp"
variant) with a reference to the underlying struct.

Further note the Linux Coding Style frowns upon mixed-case names and
so-called Hungarian notation, so in conjunction rename the underlying
struct to be in compliance.

Change-Id: Ic66dbf6592032a59b9b79cd1995cd43aa0d118d3
CRs-Fixed: 2395995
Jeff Johnson 6 năm trước cách đây
mục cha
commit
3eb7111f04

+ 2 - 2
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 ---> */

+ 3 - 3
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;

+ 2 - 2
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.
 	 */