qcacld-3.0: Fix the issue with SU Tx beamformer cfg setting

There are two cfg setting parameters defined for SU Tx beamformer
and improperly updated the cfg settings hence the Tx beamformer
capability advertised as unsupported always.
Remove the redundant setting for SU Tx beamformer and update the cfg
with correct values.

Change-Id: I422179ae87ab5c561f0356bcab4585fbdc53c0bd
CRs-Fixed: 2343090

components/mlme/core/src/wlan_mlme_main.c

@@ -531,8 +531,6 @@ static void mlme_init_vht_cap_cfg(struct wlan_objmgr_psoc *psoc,
 			CFG_VHT_TX_MCS_MAP_STADEF;
 	vht_cap_info->basic_mcs_set =
 			CFG_VHT_BASIC_MCS_SET_STADEF;
-	vht_cap_info->su_bformer =
-			cfg_default(CFG_VHT_SU_BEAMFORMER_CAP);
 
 	vht_cap_info->tx_bfee_ant_supp =
 			cfg_get(psoc, CFG_VHT_BEAMFORMEE_ANT_SUPP);
@@ -592,10 +590,10 @@ static void mlme_init_vht_cap_cfg(struct wlan_objmgr_psoc *psoc,
 			cfg_get(psoc, CFG_ENABLE_SUBFEE_IN_VENDOR_VHTIE);
 
 	if (vht_cap_info->enable2x2)
-		vht_cap_info->su_bfer =
+		vht_cap_info->su_bformer =
 			cfg_get(psoc, CFG_VHT_ENABLE_TX_SU_BEAM_FORMER);
 
-	if (vht_cap_info->enable2x2 && vht_cap_info->su_bfer)
+	if (vht_cap_info->enable2x2 && vht_cap_info->su_bformer)
 		vht_cap_info->num_soundingdim = NUM_OF_SOUNDING_DIMENSIONS;
 }
 

components/mlme/dispatcher/inc/cfg_mlme_vht_caps.h

@@ -166,11 +166,6 @@
 		0, \
 		"VHT ENABLE TXBF 20MHZ")
 
-#define CFG_VHT_SU_BEAMFORMER_CAP CFG_BOOL( \
-		"su_bformer", \
-		0, \
-		"VHT SU BEAMFORMER CAP")
-
 #define CFG_VHT_MU_BEAMFORMER_CAP CFG_BOOL( \
 		"mu_bformer", \
 		0, \
@@ -566,7 +561,6 @@
 
 #define CFG_VHT_CAPS_ALL \
 	CFG(CFG_VHT_SUPP_CHAN_WIDTH) \
-	CFG(CFG_VHT_SU_BEAMFORMER_CAP) \
 	CFG(CFG_VHT_SU_BEAMFORMEE_CAP) \
 	CFG(CFG_VHT_BEAMFORMEE_ANT_SUPP) \
 	CFG(CFG_VHT_ENABLE_TX_SU_BEAM_FORMER) \

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -435,7 +435,6 @@ struct wlan_mlme_mbo {
  * @tx_supp_data_rate: Tx highest supported data rate
  * @basic_mcs_set: Basic MCS set
  * @enable_txbf_20mhz: enable tx bf for 20mhz
- * @su_bfer: enable VHT tx su beam former
  * @channel_width: Channel width capability for 11ac
  * @rx_mcs: VHT Rx MCS capability for 1x1 mode
  * @tx_mcs: VHT Tx MCS capability for 1x1 mode
@@ -478,7 +477,6 @@ struct mlme_vht_capabilities_info {
 	uint32_t tx_supp_data_rate;
 	uint32_t basic_mcs_set;
 	bool enable_txbf_20mhz;
-	bool su_bfer;
 	uint8_t channel_width;
 	uint32_t rx_mcs;
 	uint32_t tx_mcs;

components/mlme/dispatcher/src/wlan_mlme_api.c

@@ -1589,7 +1589,7 @@ wlan_mlme_get_vht_tx_su_beamformer(struct wlan_objmgr_psoc *psoc, bool *value)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	*value = mlme_obj->cfg.vht_caps.vht_cap_info.su_bfer;
+	*value = mlme_obj->cfg.vht_caps.vht_cap_info.su_bformer;
 
 	return QDF_STATUS_SUCCESS;
 }