From a8a078e59ada7ed7dd34ef67f94e3e0d7d42353e Mon Sep 17 00:00:00 2001
From: Harsh Kumar Bijlani <quic_hbijlani@quicinc.com>
Date: Mon, 21 Feb 2022 13:54:12 +0530
Subject: [PATCH] qcacmn: Define macro for maximum mcs value for 11AX and 11BE

Define macro for maximum mcs values for 11AX and 11BE.
Also move bandwidth enums to cdp header file.

Change-Id: Ic24b9fa459b160702fa35162955c6bcdf678c97f
CRs-Fixed: 3134964
---
 dp/cmn_dp_api/dp_ratetable.h   | 16 ----------------
 dp/inc/cdp_txrx_mon_struct.h   | 19 ++++++++++++++-----
 dp/inc/cdp_txrx_stats_struct.h |  2 ++
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/dp/cmn_dp_api/dp_ratetable.h b/dp/cmn_dp_api/dp_ratetable.h
index fcb6b3148f..4c7eccd7ce 100644
--- a/dp/cmn_dp_api/dp_ratetable.h
+++ b/dp/cmn_dp_api/dp_ratetable.h
@@ -22,22 +22,6 @@
 
 #define CMN_DP_ASSERT(__bool)
 
-/*
- *Band Width Types
- */
-enum CMN_BW_TYPES {
-	CMN_BW_20MHZ,
-	CMN_BW_40MHZ,
-	CMN_BW_80MHZ,
-	CMN_BW_160MHZ,
-	CMN_BW_80_80MHZ,
-#ifdef WLAN_FEATURE_11BE
-	CMN_BW_320MHZ,
-#endif
-	CMN_BW_CNT,
-	CMN_BW_IDLE = 0xFF, /*default BW state */
-};
-
 /*
  * Modes Types
  */
diff --git a/dp/inc/cdp_txrx_mon_struct.h b/dp/inc/cdp_txrx_mon_struct.h
index f8d7d6c888..83f5797ddb 100644
--- a/dp/inc/cdp_txrx_mon_struct.h
+++ b/dp/inc/cdp_txrx_mon_struct.h
@@ -95,11 +95,20 @@ enum {
 	CDP_RX_TYPE_MU_OFDMA_MIMO,
 };
 
-enum {
-	CDP_FULL_RX_BW_20 = 0,
-	CDP_FULL_RX_BW_40,
-	CDP_FULL_RX_BW_80,
-	CDP_FULL_RX_BW_160,
+/*
+ *Band Width Types
+ */
+enum CMN_BW_TYPES {
+	CMN_BW_20MHZ,
+	CMN_BW_40MHZ,
+	CMN_BW_80MHZ,
+	CMN_BW_160MHZ,
+	CMN_BW_80_80MHZ,
+#ifdef WLAN_FEATURE_11BE
+	CMN_BW_320MHZ,
+#endif
+	CMN_BW_CNT,
+	CMN_BW_IDLE = 0xFF, /*default BW state */
 };
 
 struct cdp_mon_status {
diff --git a/dp/inc/cdp_txrx_stats_struct.h b/dp/inc/cdp_txrx_stats_struct.h
index f3cdafc747..6fa9039f9f 100644
--- a/dp/inc/cdp_txrx_stats_struct.h
+++ b/dp/inc/cdp_txrx_stats_struct.h
@@ -46,12 +46,14 @@
 /* 1 additional MCS is for invalid values */
 #ifdef WLAN_FEATURE_11BE
 #define MAX_MCS (16 + 1)
+#define MAX_MCS_11BE 16
 #else
 #define MAX_MCS (14 + 1)
 #endif
 #define MAX_MCS_11A 8
 #define MAX_MCS_11B 7
 #define MAX_MCS_11AC 12
+#define MAX_MCS_11AX 14
 /* 1 additional GI is for invalid values */
 #define MAX_GI (4 + 1)
 #define SS_COUNT 8