Переглянути джерело

qcacld-3.0: Replace typedef tSirSmeMicFailureInd

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 tSirSmeMicFailureInd 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: Ic5cd76804a3e1462c1e92be3d1d2dd6911b108dc
CRs-Fixed: 2395996
Jeff Johnson 6 роки тому
батько
коміт
ffb93e1699

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

@@ -1364,13 +1364,13 @@ struct switch_channel_ind {
 /* / Definition for MIC failure indication */
 /* / MAC ---> */
 /* / MAC reports this each time a MIC failure occures on Rx TKIP packet */
-typedef struct sSirSmeMicFailureInd {
+struct mic_failure_ind {
 	uint16_t messageType;   /* eWNI_SME_MIC_FAILURE_IND */
 	uint16_t length;
 	uint8_t sessionId;
 	struct qdf_mac_addr bssId;
 	tSirMicFailureInfo info;
-} tSirSmeMicFailureInd, *tpSirSmeMicFailureInd;
+};
 
 typedef struct sSirSmeMissedBeaconInd {
 	uint16_t messageType;   /* eWNI_SME_MISSED_BEACON_IND */

+ 1 - 1
core/sme/inc/csr_api.h

@@ -370,7 +370,7 @@ typedef enum {
 	eCSR_ROAM_LOSTLINK_DETECTED,
 	/*
 	 * TKIP MIC error detected, callback gets a pointer
-	 * to tpSirSmeMicFailureInd
+	 * to struct mic_failure_ind
 	 */
 	eCSR_ROAM_MIC_ERROR_IND,
 	/* IBSS indications. */

+ 6 - 9
core/sme/src/csr/csr_api_roam.c

@@ -11083,23 +11083,20 @@ csr_roam_chk_lnk_mic_fail_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 {
 	uint32_t sessionId = CSR_SESSION_ID_INVALID;
 	QDF_STATUS status;
-	struct csr_roam_info *roam_info_ptr = NULL;
 	struct csr_roam_info roam_info;
-	tpSirSmeMicFailureInd pMicInd = (tpSirSmeMicFailureInd) msg_ptr;
+	struct mic_failure_ind *mic_ind = (struct mic_failure_ind *)msg_ptr;
 	eCsrRoamResult result = eCSR_ROAM_RESULT_MIC_ERROR_UNICAST;
 
-	qdf_mem_zero(&roam_info, sizeof(roam_info));
 	status = csr_roam_get_session_id_from_bssid(mac_ctx,
-				&pMicInd->bssId, &sessionId);
+				&mic_ind->bssId, &sessionId);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		qdf_mem_zero(&roam_info, sizeof(struct csr_roam_info));
-		roam_info.u.pMICFailureInfo = &pMicInd->info;
-		roam_info_ptr = &roam_info;
-		if (pMicInd->info.multicast)
+		qdf_mem_zero(&roam_info, sizeof(roam_info));
+		roam_info.u.pMICFailureInfo = &mic_ind->info;
+		if (mic_ind->info.multicast)
 			result = eCSR_ROAM_RESULT_MIC_ERROR_GROUP;
 		else
 			result = eCSR_ROAM_RESULT_MIC_ERROR_UNICAST;
-		csr_roam_call_callback(mac_ctx, sessionId, roam_info_ptr, 0,
+		csr_roam_call_callback(mac_ctx, sessionId, &roam_info, 0,
 				       eCSR_ROAM_MIC_ERROR_IND, result);
 	}
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR

+ 2 - 2
core/wma/src/wma_data.c

@@ -3044,7 +3044,7 @@ void ol_rx_err(void *pdev, uint8_t vdev_id,
 	       uint64_t *pn, uint8_t key_id)
 {
 	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
-	tpSirSmeMicFailureInd mic_err_ind;
+	struct mic_failure_ind *mic_err_ind;
 	struct ether_header *eth_hdr;
 	struct scheduler_msg cds_msg = {0};
 
@@ -3190,7 +3190,7 @@ wma_indicate_err(
 	case OL_RX_ERR_TKIP_MIC:
 	{
 		tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
-		tpSirSmeMicFailureInd mic_err_ind;
+		struct mic_failure_ind *mic_err_ind;
 		struct scheduler_msg cds_msg = {0};
 		uint8_t vdev_id;