Browse Source

qcacld-3.0: Replace typedef tComebackTimerInfo

Per the Linux coding style "mixed-case names are frowned upon" and
"so-called Hungarian notation [...] is brain damaged." One identifier
used extensively throughout the driver that violates both of these
tenants is "pMac." In order to be compliant with the Linux coding
style there is a campaign to rename all instances of this identifier.
One instance is the following field in typedef tComebackTimerInfo:
-       tpAniSirGlobal pMac;

In order to meet the needs of the campaign all that is really needed
is to rename this field and modify all accesses to this field. However
note that the Linux coding style also objects to typedefs except in a
few cases, and the use case for tComebackTimerInfo does not apply.
Therefore to address the larger problem replace the tComebackTimerInfo
typedef with an appropriately named struct with appropriately named
fields.

Change-Id: I397af122fdf8a2b15fc829411698150ae8b7ef94
CRs-Fixed: 2354998
Jeff Johnson 6 years ago
parent
commit
4a07a9b195

+ 7 - 7
core/mac/src/pe/include/lim_session.h

@@ -42,12 +42,12 @@ typedef struct sPowersaveoffloadInfo {
 } tPowersaveoffloadInfo, tpPowersaveoffloadInfo;
 
 #ifdef WLAN_FEATURE_11W
-typedef struct tagComebackTimerInfo {
-	tpAniSirGlobal pMac;
-	uint8_t sessionID;
-	tLimMlmStates limPrevMlmState;  /* Previous MLM State */
-	tLimMlmStates limMlmState;      /* MLM State */
-} tComebackTimerInfo;
+struct comeback_timer_info {
+	tpAniSirGlobal mac;
+	uint8_t session_id;
+	tLimMlmStates lim_prev_mlm_state;  /* Previous MLM State */
+	tLimMlmStates lim_mlm_state;       /* MLM State */
+};
 #endif /* WLAN_FEATURE_11W */
 /*--------------------------------------------------------------------------
    Include Files
@@ -471,7 +471,7 @@ struct pe_session {
 	bool isNonRoamReassoc;
 #ifdef WLAN_FEATURE_11W
 	qdf_mc_timer_t pmfComebackTimer;
-	tComebackTimerInfo pmfComebackTimerInfo;
+	struct comeback_timer_info pmfComebackTimerInfo;
 #endif /* WLAN_FEATURE_11W */
 	uint8_t  is_key_installed;
 	/* timer for resetting protection fileds at regular intervals */

+ 2 - 2
core/mac/src/pe/lim/lim_process_mlm_req_messages.c

@@ -1287,9 +1287,9 @@ static void lim_process_mlm_assoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 	 * TRY_AGAIN_LATER return code.
 	 */
 	if (session_entry->limRmfEnabled) {
-		session_entry->pmfComebackTimerInfo.limPrevMlmState =
+		session_entry->pmfComebackTimerInfo.lim_prev_mlm_state =
 			session_entry->limPrevMlmState;
-		session_entry->pmfComebackTimerInfo.limMlmState =
+		session_entry->pmfComebackTimerInfo.lim_mlm_state =
 			session_entry->limMlmState;
 	}
 #endif /* WLAN_FEATURE_11W */

+ 5 - 5
core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c

@@ -429,14 +429,14 @@ static void lim_send_mlm_assoc_req(tpAniSirGlobal mac_ctx,
  */
 void lim_pmf_comeback_timer_callback(void *context)
 {
-	tComebackTimerInfo *info = (tComebackTimerInfo *) context;
-	tpAniSirGlobal mac_ctx = info->pMac;
-	tpPESession psessionEntry = &mac_ctx->lim.gpSession[info->sessionID];
+	struct comeback_timer_info *info = context;
+	tpAniSirGlobal mac_ctx = info->mac;
+	tpPESession psessionEntry = &mac_ctx->lim.gpSession[info->session_id];
 
 	pe_err("comeback later timer expired. sending MLM ASSOC req");
 	/* set MLM state such that ASSOC REQ packet will be sent out */
-	psessionEntry->limPrevMlmState = info->limPrevMlmState;
-	psessionEntry->limMlmState = info->limMlmState;
+	psessionEntry->limPrevMlmState = info->lim_prev_mlm_state;
+	psessionEntry->limMlmState = info->lim_mlm_state;
 	lim_send_mlm_assoc_req(mac_ctx, psessionEntry);
 }
 #endif /* WLAN_FEATURE_11W */

+ 2 - 2
core/mac/src/pe/lim/lim_session.c

@@ -283,8 +283,8 @@ tpPESession session, uint8_t session_id)
 {
 	QDF_STATUS status;
 
-	session->pmfComebackTimerInfo.pMac = mac_ctx;
-	session->pmfComebackTimerInfo.sessionID = session_id;
+	session->pmfComebackTimerInfo.mac = mac_ctx;
+	session->pmfComebackTimerInfo.session_id = session_id;
 	status = qdf_mc_timer_init(&session->pmfComebackTimer,
 			QDF_TIMER_TYPE_SW, lim_pmf_comeback_timer_callback,
 			(void *)&session->pmfComebackTimerInfo);