Bladeren bron

qcacld-3.0: Replace typedef tSirSmeWmStatusChangeNtf

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 tSirSmeWmStatusChangeNtf
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: Iab453ae756ce6c54d1ddbdcbad6caea3ecc21336
CRs-Fixed: 2395003
Jeff Johnson 6 jaren geleden
bovenliggende
commit
5388932554
3 gewijzigde bestanden met toevoegingen van 7 en 7 verwijderingen
  1. 2 2
      core/mac/inc/sir_api.h
  2. 3 3
      core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
  3. 2 2
      core/sme/src/csr/csr_api_roam.c

+ 2 - 2
core/mac/inc/sir_api.h

@@ -1193,7 +1193,7 @@ struct ap_new_caps {
  */
 
 /* / Definition for Wireless medium status change notification */
-typedef struct sSirSmeWmStatusChangeNtf {
+struct wm_status_change_ntf {
 	uint16_t messageType;   /* eWNI_SME_WM_STATUS_CHANGE_NTF */
 	uint16_t length;
 	uint8_t sessionId;      /* Session ID */
@@ -1216,7 +1216,7 @@ typedef struct sSirSmeWmStatusChangeNtf {
 		/* eSIR_SME_AP_CAPS_CHANGED */
 		struct ap_new_caps apNewCaps;
 	} statusChangeInfo;
-} tSirSmeWmStatusChangeNtf, *tpSirSmeWmStatusChangeNtf;
+};
 
 /* Definition for Disassociation request */
 typedef struct sSirSmeDisassocReq {

+ 3 - 3
core/mac/src/pe/lim/lim_send_sme_rsp_messages.c

@@ -1294,10 +1294,10 @@ lim_send_sme_wm_status_change_ntf(struct mac_context *mac_ctx,
 	uint32_t *status_change_info, uint16_t info_len, uint8_t session_id)
 {
 	struct scheduler_msg msg = {0};
-	tSirSmeWmStatusChangeNtf *wm_status_change_ntf;
+	struct wm_status_change_ntf *wm_status_change_ntf;
 	uint32_t max_info_len;
 
-	wm_status_change_ntf = qdf_mem_malloc(sizeof(tSirSmeWmStatusChangeNtf));
+	wm_status_change_ntf = qdf_mem_malloc(sizeof(*wm_status_change_ntf));
 	if (!wm_status_change_ntf)
 		return;
 
@@ -1324,7 +1324,7 @@ lim_send_sme_wm_status_change_ntf(struct mac_context *mac_ctx,
 		wm_status_change_ntf->messageType =
 			eWNI_SME_WM_STATUS_CHANGE_NTF;
 		wm_status_change_ntf->statusChangeCode = status_change_code;
-		wm_status_change_ntf->length = sizeof(tSirSmeWmStatusChangeNtf);
+		wm_status_change_ntf->length = sizeof(*wm_status_change_ntf);
 		wm_status_change_ntf->sessionId = session_id;
 		if (info_len <= max_info_len && status_change_info) {
 			qdf_mem_copy(

+ 2 - 2
core/sme/src/csr/csr_api_roam.c

@@ -11165,7 +11165,7 @@ csr_roam_chk_lnk_wm_status_change_ntf(struct mac_context *mac_ctx,
 	uint32_t sessionId = CSR_SESSION_ID_INVALID;
 	QDF_STATUS status;
 	struct csr_roam_info *roam_info_ptr = NULL;
-	tSirSmeWmStatusChangeNtf *pStatusChangeMsg;
+	struct wm_status_change_ntf *pStatusChangeMsg;
 	struct csr_roam_info roam_info;
 	struct ap_new_caps *pApNewCaps;
 	eCsrRoamResult result = eCSR_ROAM_RESULT_NONE;
@@ -11174,7 +11174,7 @@ csr_roam_chk_lnk_wm_status_change_ntf(struct mac_context *mac_ctx,
 	eRoamCmdStatus roamStatus = eCSR_ROAM_FAILED;
 
 	qdf_mem_zero(&roam_info, sizeof(roam_info));
-	pStatusChangeMsg = (tSirSmeWmStatusChangeNtf *) msg_ptr;
+	pStatusChangeMsg = (struct wm_status_change_ntf *) msg_ptr;
 	switch (pStatusChangeMsg->statusChangeCode) {
 	case eSIR_SME_IBSS_ACTIVE:
 		sessionId = csr_find_ibss_session(mac_ctx);