瀏覽代碼

qcacld-3.0: Replace typedef tSirMacESETSMIE

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 tSirMacESETSMIE typedef does
not meet any of those criteria, so replace it 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: Ie14f95860e83a2099f457e6f62261a8c77f9f1fe
CRs-Fixed: 2394994
Jeff Johnson 6 年之前
父節點
當前提交
4f340528ec

+ 5 - 4
core/mac/inc/sir_api.h

@@ -853,11 +853,12 @@ struct ese_tsrs_ie {
 	uint8_t rates[8];
 };
 
-typedef struct sSirMacESETSMIE {
+struct ese_tsm_ie {
 	uint8_t tsid;
 	uint8_t state;
 	uint16_t msmt_interval;
-} tSirMacESETSMIE;
+};
+
 typedef struct sTSMStats {
 	uint8_t tid;
 	struct qdf_mac_addr bssid;
@@ -865,7 +866,7 @@ typedef struct sTSMStats {
 } tTSMStats, *tpTSMStats;
 typedef struct sEseTSMContext {
 	uint8_t tid;
-	tSirMacESETSMIE tsmInfo;
+	struct ese_tsm_ie tsmInfo;
 	tTrafStrmMetrics tsmMetrics;
 } tEseTSMContext, *tpEseTSMContext;
 typedef struct sEsePEContext {
@@ -1597,7 +1598,7 @@ typedef struct sSirAddtsRspInfo {
 	uint8_t tclasProc;
 	tSirMacScheduleIE schedule;
 #ifdef FEATURE_WLAN_ESE
-	tSirMacESETSMIE tsmIE;
+	struct ese_tsm_ie tsmIE;
 	uint8_t tsmPresent:1;
 #endif
 	uint8_t wmeTspecPresent:1;

+ 1 - 1
core/mac/src/include/parser_api.h

@@ -380,7 +380,7 @@ typedef struct sSirAssocRsp {
 #ifdef FEATURE_WLAN_ESE
 	uint8_t num_tspecs;
 	tDot11fIEWMMTSPEC TSPECInfo[SIR_ESE_MAX_TSPEC_IES];
-	tSirMacESETSMIE tsmIE;
+	struct ese_tsm_ie tsmIE;
 #endif
 
 	uint8_t suppRatesPresent;

+ 1 - 1
core/mac/src/pe/lim/lim_process_action_frame.c

@@ -759,7 +759,7 @@ static void __lim_process_add_ts_rsp(struct mac_context *mac_ctx,
 		session->eseContext.tsm.tid =
 			addts.tspec.tsinfo.traffic.userPrio;
 		qdf_mem_copy(&session->eseContext.tsm.tsmInfo,
-			     &addts.tsmIE, sizeof(tSirMacESETSMIE));
+			     &addts.tsmIE, sizeof(struct ese_tsm_ie));
 		lim_send_sme_tsm_ie_ind(mac_ctx, session, addts.tsmIE.tsid,
 					addts.tsmIE.state,
 					addts.tsmIE.msmt_interval);

+ 1 - 1
core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c

@@ -399,7 +399,7 @@ static void lim_update_ese_tsm(struct mac_context *mac_ctx,
 			tsm_ctx->tid =
 				assoc_rsp->TSPECInfo[cnt].user_priority;
 			qdf_mem_copy(&tsm_ctx->tsmInfo,
-				&assoc_rsp->tsmIE, sizeof(tSirMacESETSMIE));
+				&assoc_rsp->tsmIE, sizeof(struct ese_tsm_ie));
 			lim_send_sme_tsm_ie_ind(mac_ctx,
 				session_entry, assoc_rsp->tsmIE.tsid,
 				assoc_rsp->tsmIE.state,

+ 3 - 3
core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -2921,7 +2921,7 @@ sir_convert_assoc_resp_frame2_struct(struct mac_context *mac,
 		pAssocRsp->tsmPresent = 1;
 		qdf_mem_copy(&pAssocRsp->tsmIE.tsid,
 				&ar->ESETrafStrmMet.tsid,
-				sizeof(tSirMacESETSMIE));
+				sizeof(struct ese_tsm_ie));
 	}
 #endif
 
@@ -4341,7 +4341,7 @@ sir_convert_addts_rsp2_struct(struct mac_context *mac,
 			pAddTs->tsmPresent = 1;
 			qdf_mem_copy(&pAddTs->tsmIE.tsid,
 				     &addts.ESETrafStrmMet.tsid,
-				     sizeof(tSirMacESETSMIE));
+				     sizeof(struct ese_tsm_ie));
 		}
 #endif
 		if (addts.Schedule.present) {
@@ -4406,7 +4406,7 @@ sir_convert_addts_rsp2_struct(struct mac_context *mac,
 			pAddTs->tsmPresent = 1;
 			qdf_mem_copy(&pAddTs->tsmIE.tsid,
 				     &wmmaddts.ESETrafStrmMet.tsid,
-				     sizeof(tSirMacESETSMIE));
+				     sizeof(struct ese_tsm_ie));
 		}
 #endif