qcacld-3.0: Fix tTxrateinfoflags as per linux coding guidelines
Fix tTxrateinfoflags as per linux coding guidelines, this will later
help move the struct to qcacmn.
Change-Id: I1911d25594aaecc7c166cf36b79111b61e6de457
CRs-Fixed: 2244834
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index eae60bd..eb46e3f 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -1893,17 +1893,29 @@
void *txFailIndCallback;
} tAniTXFailMonitorInd, *tpAniTXFailMonitorInd;
-typedef enum eTxRateInfo {
- eHAL_TX_RATE_LEGACY = 0x1, /* Legacy rates */
- eHAL_TX_RATE_HT20 = 0x2, /* HT20 rates */
- eHAL_TX_RATE_HT40 = 0x4, /* HT40 rates */
- eHAL_TX_RATE_SGI = 0x8, /* Rate with Short guard interval */
- eHAL_TX_RATE_LGI = 0x10, /* Rate with Long guard interval */
- eHAL_TX_RATE_VHT20 = 0x20, /* VHT 20 rates */
- eHAL_TX_RATE_VHT40 = 0x40, /* VHT 40 rates */
- eHAL_TX_RATE_VHT80 = 0x80 /* VHT 80 rates */
-} tTxrateinfoflags;
-
+#ifndef QCA_SUPPORT_CP_STATS
+/**
+ * enum tx_rate_info - tx_rate flags
+ * @TX_RATE_LEGACY: Legacy rates
+ * @TX_RATE_HT20: HT20 rates
+ * @TX_RATE_HT40: HT40 rates
+ * @TX_RATE_SGI: Rate with Short guard interval
+ * @TX_RATE_LGI: Rate with Long guard interval
+ * @TX_RATE_VHT20: VHT 20 rates
+ * @TX_RATE_VHT40: VHT 40 rates
+ * @TX_RATE_VHT80: VHT 80 rates
+ */
+enum tx_rate_info {
+ TX_RATE_LEGACY = 0x1,
+ TX_RATE_HT20 = 0x2,
+ TX_RATE_HT40 = 0x4,
+ TX_RATE_SGI = 0x8,
+ TX_RATE_LGI = 0x10,
+ TX_RATE_VHT20 = 0x20,
+ TX_RATE_VHT40 = 0x40,
+ TX_RATE_VHT80 = 0x80
+};
+#endif
/**********************PE Statistics end*************************/
typedef struct sSirP2PNoaStart {
@@ -3606,7 +3618,7 @@
int32_t ucastDataRate;
/* TX flag to differentiate between HT20, HT40 etc */
- tTxrateinfoflags ucastDataRateTxFlag;
+ enum tx_rate_info ucastDataRateTxFlag;
/*
* 0 implies MCAST RA, positive value implies fixed rate,
@@ -3615,7 +3627,7 @@
int32_t reliableMcastDataRate; /* unit Mbpsx10 */
/* TX flag to differentiate between HT20, HT40 etc */
- tTxrateinfoflags reliableMcastDataRateTxFlag;
+ enum tx_rate_info reliableMcastDataRateTxFlag;
/*
* MCAST(or BCAST) fixed data rate in 2.4 GHz, unit Mbpsx10,
@@ -3624,7 +3636,7 @@
uint32_t mcastDataRate24GHz;
/* TX flag to differentiate between HT20, HT40 etc */
- tTxrateinfoflags mcastDataRate24GHzTxFlag;
+ enum tx_rate_info mcastDataRate24GHzTxFlag;
/*
* MCAST(or BCAST) fixed data rate in 5 GHz,
@@ -3633,7 +3645,7 @@
uint32_t mcastDataRate5GHz;
/* TX flag to differentiate between HT20, HT40 etc */
- tTxrateinfoflags mcastDataRate5GHzTxFlag;
+ enum tx_rate_info mcastDataRate5GHzTxFlag;
} tSirRateUpdateInd, *tpSirRateUpdateInd;
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index 4103629..a030ff2 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -188,29 +188,29 @@
if (!sta_ds->mlmStaContext.htCapability &&
!sta_ds->mlmStaContext.vhtCapability) {
- rate_flags |= eHAL_TX_RATE_LEGACY;
+ rate_flags |= TX_RATE_LEGACY;
} else {
if (sta_ds->mlmStaContext.vhtCapability) {
if (WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ ==
sta_ds->vhtSupportedChannelWidthSet) {
- rate_flags |= eHAL_TX_RATE_VHT80;
+ rate_flags |= TX_RATE_VHT80;
} else if (WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ ==
sta_ds->vhtSupportedChannelWidthSet) {
if (sta_ds->htSupportedChannelWidthSet)
- rate_flags |= eHAL_TX_RATE_VHT40;
+ rate_flags |= TX_RATE_VHT40;
else
- rate_flags |= eHAL_TX_RATE_VHT20;
+ rate_flags |= TX_RATE_VHT20;
}
} else if (sta_ds->mlmStaContext.htCapability) {
if (sta_ds->htSupportedChannelWidthSet)
- rate_flags |= eHAL_TX_RATE_HT40;
+ rate_flags |= TX_RATE_HT40;
else
- rate_flags |= eHAL_TX_RATE_HT20;
+ rate_flags |= TX_RATE_HT20;
}
}
if (sta_ds->htShortGI20Mhz || sta_ds->htShortGI40Mhz)
- rate_flags |= eHAL_TX_RATE_SGI;
+ rate_flags |= TX_RATE_SGI;
return rate_flags;
}