qcacld-3.0: Add prefix NSS_CHAINS to band info

Add prefix NSS_CHAINS to band info to remove duplicate band
info in driver, and minor code cleanup.

Change-Id: I3a8446af6b6c272cfcb19583540e2384f64e3a1a
CRs-Fixed: 2347624

mlme/core/src/wlan_mlme_main.c

@@ -1262,29 +1262,32 @@ static void mlme_init_oce_cfg(struct wlan_objmgr_psoc *psoc,
 static void mlme_init_nss_chains(struct wlan_objmgr_psoc *psoc,
 				 struct wlan_mlme_nss_chains *nss_chains)
 {
-	nss_chains->num_rx_chains[BAND_2GHZ] = cfg_get(psoc,
-						       CFG_NUM_RX_CHAINS_2G);
-	nss_chains->num_rx_chains[BAND_5GHZ] = cfg_get(psoc,
-						       CFG_NUM_RX_CHAINS_5G);
-	nss_chains->num_tx_chains[BAND_2GHZ] = cfg_get(psoc,
-						       CFG_NUM_TX_CHAINS_2G);
-	nss_chains->num_tx_chains[BAND_5GHZ] = cfg_get(psoc,
-						       CFG_NUM_TX_CHAINS_5G);
-	nss_chains->tx_nss[BAND_2GHZ] = cfg_get(psoc, CFG_TX_NSS_2G);
-	nss_chains->tx_nss[BAND_5GHZ] = cfg_get(psoc, CFG_TX_NSS_5G);
-	nss_chains->rx_nss[BAND_2GHZ] = cfg_get(psoc, CFG_RX_NSS_2G);
-	nss_chains->rx_nss[BAND_5GHZ] = cfg_get(psoc, CFG_RX_NSS_5G);
+	nss_chains->num_rx_chains[NSS_CHAINS_BAND_2GHZ] =
+					    cfg_get(psoc, CFG_NUM_RX_CHAINS_2G);
+	nss_chains->num_rx_chains[NSS_CHAINS_BAND_5GHZ] =
+					    cfg_get(psoc, CFG_NUM_RX_CHAINS_5G);
+	nss_chains->num_tx_chains[NSS_CHAINS_BAND_2GHZ] =
+					    cfg_get(psoc, CFG_NUM_TX_CHAINS_2G);
+	nss_chains->num_tx_chains[NSS_CHAINS_BAND_5GHZ] =
+					    cfg_get(psoc, CFG_NUM_TX_CHAINS_5G);
+
+	nss_chains->tx_nss[NSS_CHAINS_BAND_2GHZ] = cfg_get(psoc, CFG_TX_NSS_2G);
+	nss_chains->tx_nss[NSS_CHAINS_BAND_5GHZ] = cfg_get(psoc, CFG_TX_NSS_5G);
+	nss_chains->rx_nss[NSS_CHAINS_BAND_2GHZ] = cfg_get(psoc, CFG_RX_NSS_2G);
+	nss_chains->rx_nss[NSS_CHAINS_BAND_5GHZ] = cfg_get(psoc, CFG_RX_NSS_5G);
+
 	nss_chains->num_tx_chains_11b = cfg_get(psoc, CFG_NUM_TX_CHAINS_11b);
 	nss_chains->num_tx_chains_11g = cfg_get(psoc, CFG_NUM_TX_CHAINS_11g);
 	nss_chains->num_tx_chains_11a = cfg_get(psoc, CFG_NUM_TX_CHAINS_11a);
-	nss_chains->disable_rx_mrc[BAND_2GHZ] = cfg_get(psoc,
-							CFG_DISABLE_RX_MRC_2G);
-	nss_chains->disable_rx_mrc[BAND_5GHZ] = cfg_get(psoc,
-							CFG_DISABLE_RX_MRC_5G);
-	nss_chains->disable_tx_mrc[BAND_2GHZ] = cfg_get(psoc,
-							CFG_DISABLE_TX_MRC_2G);
-	nss_chains->disable_tx_mrc[BAND_5GHZ] = cfg_get(psoc,
-							CFG_DISABLE_TX_MRC_5G);
+
+	nss_chains->disable_rx_mrc[NSS_CHAINS_BAND_2GHZ] =
+					   cfg_get(psoc, CFG_DISABLE_RX_MRC_2G);
+	nss_chains->disable_rx_mrc[NSS_CHAINS_BAND_5GHZ] =
+					   cfg_get(psoc, CFG_DISABLE_RX_MRC_5G);
+	nss_chains->disable_tx_mrc[NSS_CHAINS_BAND_2GHZ] =
+					   cfg_get(psoc, CFG_DISABLE_TX_MRC_2G);
+	nss_chains->disable_tx_mrc[NSS_CHAINS_BAND_5GHZ] =
+					   cfg_get(psoc, CFG_DISABLE_TX_MRC_5G);
 }
 static void mlme_init_wep_keys(struct wlan_mlme_wep_cfg *wep_params)
 {

mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -1027,14 +1027,14 @@ enum dot11p_mode {
 
 /**
  * enum nss_chains_band_info - Band info for dynamic nss, chains change feature
- * @BAND_2GHZ: 2.4Ghz band
- * @BAND_5GHZ: 5Ghz band
- * @BAND_MAX: Max bands supported
+ * @NSS_CHAINS_BAND_2GHZ: 2.4Ghz band
+ * @NSS_CHAINS_BAND_5GHZ: 5Ghz band
+ * @NSS_CHAINS_BAND_MAX: Max bands supported
  */
 enum nss_chains_band_info {
-	BAND_2GHZ = 0,
-	BAND_5GHZ,
-	BAND_MAX,
+	NSS_CHAINS_BAND_2GHZ = 0,
+	NSS_CHAINS_BAND_5GHZ,
+	NSS_CHAINS_BAND_MAX,
 };
 
 #define MAX_VDEV_NSS                2
@@ -1053,15 +1053,15 @@ enum nss_chains_band_info {
  * @disable_tx_mrc:                  disable 2 tx chains, in tx nss 1 mode
  */
 struct wlan_mlme_nss_chains {
-	uint32_t num_tx_chains[BAND_MAX];
-	uint32_t num_rx_chains[BAND_MAX];
-	uint32_t tx_nss[BAND_MAX];
-	uint32_t rx_nss[BAND_MAX];
+	uint32_t num_tx_chains[NSS_CHAINS_BAND_MAX];
+	uint32_t num_rx_chains[NSS_CHAINS_BAND_MAX];
+	uint32_t tx_nss[NSS_CHAINS_BAND_MAX];
+	uint32_t rx_nss[NSS_CHAINS_BAND_MAX];
 	uint32_t num_tx_chains_11b;
 	uint32_t num_tx_chains_11g;
 	uint32_t num_tx_chains_11a;
-	bool disable_rx_mrc[BAND_MAX];
-	bool disable_tx_mrc[BAND_MAX];
+	bool disable_rx_mrc[NSS_CHAINS_BAND_MAX];
+	bool disable_tx_mrc[NSS_CHAINS_BAND_MAX];
 };
 
 /**

mlme/dispatcher/inc/wlan_mlme_ucfg_api.h

@@ -27,6 +27,7 @@
 #include <wlan_objmgr_global_obj.h>
 #include <wlan_cmn.h>
 #include <wlan_mlme_api.h>
+#include <wlan_mlme_vdev_mgr_interface.h>
 
 /**
  * ucfg_mlme_init() - initialize mlme_ctx context.
@@ -1567,6 +1568,36 @@ ucfg_mlme_get_vht_tx_mcs_2x2(struct wlan_objmgr_psoc *psoc, uint8_t *value)
 	return wlan_mlme_get_vht_tx_mcs_2x2(psoc, value);
 }
 
+/**
+ * ucfg_mlme_get_ini_vdev_config() - get the ini capability of vdev
+ * @vdev: pointer to the vdev obj
+ *
+ * This API will get the ini config of the vdev related to
+ * the nss, chains params
+ *
+ * Return: pointer to the nss, chain param ini cfg structure
+ */
+static inline struct wlan_mlme_nss_chains *
+ucfg_mlme_get_ini_vdev_config(struct wlan_objmgr_vdev *vdev)
+{
+	return mlme_get_ini_vdev_config(vdev);
+}
+
+/**
+ * ucfg_mlme_get_dynamic_vdev_config() - get the dynamic capability of vdev
+ * @vdev: pointer to the vdev obj
+ *
+ * This API will get the dynamic config of the vdev related to nss,
+ * chains params
+ *
+ * Return: pointer to the nss, chain param dynamic cfg structure
+ */
+static inline struct wlan_mlme_nss_chains *
+ucfg_mlme_get_dynamic_vdev_config(struct wlan_objmgr_vdev *vdev)
+{
+	return mlme_get_dynamic_vdev_config(vdev);
+}
+
 /**
  * ucfg_mlme_get_vht20_mcs9() - Enables VHT MCS9 in 20M BW operation
  * @psoc: psoc context