qcacld-3.0: Fix camel case names in mlme_ht_capabilities_info structure

Rename camel case names of members of mlme_ht_capabilities_info
structure.

Change-Id: I576ad77c4744c240537d540f1efaab0e7d9cb109
CRs-Fixed: 2293859

components/mlme/core/src/wlan_mlme_main.c

@@ -137,12 +137,13 @@ static void mlme_update_ht_cap_in_cfg(struct wlan_objmgr_psoc *psoc,
 
 	u.val_16 = (uint16_t)cfg_default(CFG_HT_CAP_INFO);
 
-	u.default_ht_cap_info.advCodingCap = cfg_get(psoc, CFG_RX_LDPC_ENABLE);
-	u.default_ht_cap_info.rxSTBC = cfg_get(psoc, CFG_RX_STBC_ENABLE);
-	u.default_ht_cap_info.txSTBC = cfg_get(psoc, CFG_TX_STBC_ENABLE);
-	u.default_ht_cap_info.shortGI20MHz =
+	u.default_ht_cap_info.adv_coding_cap =
+				cfg_get(psoc, CFG_RX_LDPC_ENABLE);
+	u.default_ht_cap_info.rx_stbc = cfg_get(psoc, CFG_RX_STBC_ENABLE);
+	u.default_ht_cap_info.tx_stbc = cfg_get(psoc, CFG_TX_STBC_ENABLE);
+	u.default_ht_cap_info.short_gi_20_mhz =
 				cfg_get(psoc, CFG_SHORT_GI_20MHZ);
-	u.default_ht_cap_info.shortGI40MHz =
+	u.default_ht_cap_info.short_gi_40_mhz =
 				cfg_get(psoc, CFG_SHORT_GI_40MHZ);
 
 	*ht_cap_info = u.default_ht_cap_info;

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -27,54 +27,54 @@
 
 /**
  * struct mlme_ht_capabilities_info - HT Capabilities Info
- * @lsigTXOPProtection: L-SIG TXOP Protection Mechanism support
- * @stbcControlFrame: STBC Control frame support
+ * @l_sig_tx_op_protection: L-SIG TXOP Protection Mechanism support
+ * @stbc_control_frame: STBC Control frame support
  * @psmp: PSMP Support
- * @dsssCckMode40MHz: To indicate use of DSSS/CCK in 40Mhz
- * @maximalAMSDUsize: Maximum AMSDU Size - 0:3839 octes, 1:7935 octets
- * @delayedBA: Support of Delayed Block Ack
- * @rxSTBC: Rx STBC Support - 0:Not Supported, 1: 1SS, 2: 1,2SS, 3: 1,2,3SS
- * @txSTBC: Tx STBC Support
- * @shortGI40MHz: Short GI Support for HT40
- * @shortGI20MHz: Short GI support for HT20
- * @greenField: Support for HT Greenfield PPDUs
- * @mimoPowerSave: SM Power Save Mode - 0:Static, 1:Dynamic, 3:Disabled, 2:Res
- * @supportedChannelWidthSet: Supported Channel Width - 0:20Mhz, 1:20Mhz & 40Mhz
- * @advCodingCap: Rx LDPC support
+ * @dsss_cck_mode_40_mhz: To indicate use of DSSS/CCK in 40Mhz
+ * @maximal_amsdu_size: Maximum AMSDU Size - 0:3839 octes, 1:7935 octets
+ * @delayed_ba: Support of Delayed Block Ack
+ * @rx_stbc: Rx STBC Support - 0:Not Supported, 1: 1SS, 2: 1,2SS, 3: 1,2,3SS
+ * @tx_stbc: Tx STBC Support
+ * @short_gi_40_mhz: Short GI Support for HT40
+ * @short_gi_20_mhz: Short GI support for HT20
+ * @green_field: Support for HT Greenfield PPDUs
+ * @mimo_power_save: SM Power Save Mode - 0:Static, 1:Dynamic, 3:Disabled, 2:Res
+ * @supported_channel_width_set: Supported Chan Width - 0:20Mhz, 1:20Mhz & 40Mhz
+ * @adv_coding_cap: Rx LDPC support
  */
 #ifndef ANI_LITTLE_BIT_ENDIAN
 struct mlme_ht_capabilities_info {
-	uint16_t lsigTXOPProtection:1;
-	uint16_t stbcControlFrame:1;
+	uint16_t l_sig_tx_op_protection:1;
+	uint16_t stbc_control_frame:1;
 	uint16_t psmp:1;
-	uint16_t dsssCckMode40MHz:1;
-	uint16_t maximalAMSDUsize:1;
-	uint16_t delayedBA:1;
-	uint16_t rxSTBC:2;
-	uint16_t txSTBC:1;
-	uint16_t shortGI40MHz:1;
-	uint16_t shortGI20MHz:1;
-	uint16_t greenField:1;
-	uint16_t mimoPowerSave:2;
-	uint16_t supportedChannelWidthSet:1;
-	uint16_t advCodingCap:1;
+	uint16_t dsss_cck_mode_40_mhz:1;
+	uint16_t maximal_amsdu_size:1;
+	uint16_t delayed_ba:1;
+	uint16_t rx_stbc:2;
+	uint16_t tx_stbc:1;
+	uint16_t short_gi_40_mhz:1;
+	uint16_t short_gi_20_mhz:1;
+	uint16_t green_field:1;
+	uint16_t mimo_power_save:2;
+	uint16_t supported_channel_width_set:1;
+	uint16_t adv_coding_cap:1;
 } qdf_packed;
 #else
 struct mlme_ht_capabilities_info {
-	uint16_t advCodingCap:1;
-	uint16_t supportedChannelWidthSet:1;
-	uint16_t mimoPowerSave:2;
-	uint16_t greenField:1;
-	uint16_t shortGI20MHz:1;
-	uint16_t shortGI40MHz:1;
-	uint16_t txSTBC:1;
-	uint16_t rxSTBC:2;
-	uint16_t delayedBA:1;
-	uint16_t maximalAMSDUsize:1;
-	uint16_t dsssCckMode40MHz:1;
+	uint16_t adv_coding_cap:1;
+	uint16_t supported_channel_width_set:1;
+	uint16_t mimo_power_save:2;
+	uint16_t green_field:1;
+	uint16_t short_gi_20_mhz:1;
+	uint16_t short_gi_40_mhz:1;
+	uint16_t tx_stbc:1;
+	uint16_t rx_stbc:2;
+	uint16_t delayed_ba:1;
+	uint16_t maximal_amsdu_size:1;
+	uint16_t dsss_cck_mode_40_mhz:1;
 	uint16_t psmp:1;
-	uint16_t stbcControlFrame:1;
-	uint16_t lsigTXOPProtection:1;
+	uint16_t stbc_control_frame:1;
+	uint16_t l_sig_tx_op_protection:1;
 } qdf_packed;
 #endif
 

core/hdd/src/wlan_hdd_cfg.c

@@ -9038,11 +9038,11 @@ QDF_STATUS hdd_update_nss(struct hdd_adapter *adapter, uint8_t nss)
 	}
 
 	if (!(hdd_ctx->ht_tx_stbc_supported && hdd_config->enable2x2)) {
-		ht_cap_info.txSTBC = 0;
+		ht_cap_info.tx_stbc = 0;
 	} else {
 		sme_cfg_get_int(mac_handle, WNI_CFG_VHT_TXSTBC, &val32);
 		hdd_debug("STBC %d", val32);
-		ht_cap_info.txSTBC = val32;
+		ht_cap_info.tx_stbc = val32;
 	}
 
 	qdf_status = ucfg_mlme_set_ht_cap_info(hdd_ctx->hdd_psoc, ht_cap_info);

core/hdd/src/wlan_hdd_cfg80211.c

@@ -12276,7 +12276,7 @@ static void wlan_hdd_update_ht_cap(struct hdd_context *hdd_ctx)
 	if (QDF_STATUS_SUCCESS != status)
 		hdd_err("could not get HT capability info");
 
-	if (ht_cap_info.txSTBC) {
+	if (ht_cap_info.tx_stbc) {
 		if (NULL != hdd_ctx->wiphy->bands[HDD_NL80211_BAND_2GHZ])
 			hdd_ctx->wiphy->bands[HDD_NL80211_BAND_2GHZ]->ht_cap.cap |=
 						IEEE80211_HT_CAP_TX_STBC;
@@ -12294,12 +12294,12 @@ static void wlan_hdd_update_ht_cap(struct hdd_context *hdd_ctx)
 		hdd_ctx->wiphy->bands[HDD_NL80211_BAND_5GHZ]->vht_cap.cap = 0;
 	}
 
-	if (!ht_cap_info.shortGI20MHz) {
+	if (!ht_cap_info.short_gi_20_mhz) {
 		wlan_hdd_band_2_4_ghz.ht_cap.cap &= ~IEEE80211_HT_CAP_SGI_20;
 		wlan_hdd_band_5_ghz.ht_cap.cap &= ~IEEE80211_HT_CAP_SGI_20;
 	}
 
-	if (!ht_cap_info.shortGI40MHz)
+	if (!ht_cap_info.short_gi_40_mhz)
 		wlan_hdd_band_5_ghz.ht_cap.cap &= ~IEEE80211_HT_CAP_SGI_40;
 }
 

core/hdd/src/wlan_hdd_main.c

@@ -1371,17 +1371,17 @@ static void hdd_update_tgt_ht_cap(struct hdd_context *hdd_ctx,
 	}
 
 	/* check and update RX STBC */
-	if (ht_cap_info.rxSTBC && !cfg->ht_rx_stbc)
-		ht_cap_info.rxSTBC = cfg->ht_rx_stbc;
+	if (ht_cap_info.rx_stbc && !cfg->ht_rx_stbc)
+		ht_cap_info.rx_stbc = cfg->ht_rx_stbc;
 
 	/* Set the LDPC capability */
-	ht_cap_info.advCodingCap = cfg->ht_rx_ldpc;
+	ht_cap_info.adv_coding_cap = cfg->ht_rx_ldpc;
 
-	if (ht_cap_info.shortGI20MHz && !cfg->ht_sgi_20)
-		ht_cap_info.shortGI20MHz = cfg->ht_sgi_20;
+	if (ht_cap_info.short_gi_20_mhz && !cfg->ht_sgi_20)
+		ht_cap_info.short_gi_20_mhz = cfg->ht_sgi_20;
 
-	if (ht_cap_info.shortGI40MHz && !cfg->ht_sgi_40)
-		ht_cap_info.shortGI40MHz = cfg->ht_sgi_40;
+	if (ht_cap_info.short_gi_40_mhz && !cfg->ht_sgi_40)
+		ht_cap_info.short_gi_40_mhz = cfg->ht_sgi_40;
 
 	hdd_ctx->num_rf_chains = cfg->num_rf_chains;
 	hdd_ctx->ht_tx_stbc_supported = cfg->ht_tx_stbc;
@@ -1390,7 +1390,7 @@ static void hdd_update_tgt_ht_cap(struct hdd_context *hdd_ctx,
 		pconfig->enable2x2 = 1;
 	} else {
 		pconfig->enable2x2 = 0;
-		ht_cap_info.txSTBC = 0;
+		ht_cap_info.tx_stbc = 0;
 
 		/* 1x1 */
 		/* Update Rx Highest Long GI data Rate */
@@ -1411,7 +1411,7 @@ static void hdd_update_tgt_ht_cap(struct hdd_context *hdd_ctx,
 		}
 	}
 	if (!(cfg->ht_tx_stbc && pconfig->enable2x2))
-		ht_cap_info.txSTBC = 0;
+		ht_cap_info.tx_stbc = 0;
 
 	status = ucfg_mlme_set_ht_cap_info(hdd_ctx->hdd_psoc, ht_cap_info);
 	if (status != QDF_STATUS_SUCCESS)

core/hdd/src/wlan_hdd_wext.c

@@ -3449,7 +3449,7 @@ int hdd_set_ldpc(struct hdd_adapter *adapter, int value)
 		return -EIO;
 	}
 
-	ht_cap_info.advCodingCap = value;
+	ht_cap_info.adv_coding_cap = value;
 	status = ucfg_mlme_set_ht_cap_info(hdd_ctx->hdd_psoc, ht_cap_info);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("Failed to set HT capability info");
@@ -3523,7 +3523,7 @@ int hdd_set_tx_stbc(struct hdd_adapter *adapter, int value)
 			hdd_err("Failed to get HT capability info");
 			return -EIO;
 		}
-		if (!ht_cap_info.txSTBC) {
+		if (!ht_cap_info.tx_stbc) {
 			hdd_err("TX STBC not supported");
 			return -EINVAL;
 		}
@@ -3589,7 +3589,7 @@ int hdd_set_rx_stbc(struct hdd_adapter *adapter, int value)
 			hdd_err("Failed to get HT capability info");
 			return -EIO;
 		}
-		if (!ht_cap_info.rxSTBC) {
+		if (!ht_cap_info.rx_stbc) {
 			hdd_warn("RX STBC not supported");
 			return -EINVAL;
 		}

core/mac/src/pe/lim/lim_api.c

@@ -298,7 +298,7 @@ static QDF_STATUS __lim_init_config(tpAniSirGlobal pMac)
 
 	/* channel bonding mode could be set to anything from 0 to 4(Titan had these */
 	/* modes But for Taurus we have only two modes: enable(>0) or disable(=0) */
-	ht_cap_info->supportedChannelWidthSet = val2 ?
+	ht_cap_info->supported_channel_width_set = val2 ?
 				      WNI_CFG_CHANNEL_BONDING_MODE_ENABLE :
 				      WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
 
@@ -310,7 +310,7 @@ static QDF_STATUS __lim_init_config(tpAniSirGlobal pMac)
 	val8 = (uint8_t) val1;
 	pHTInfoField1 = (tSirMacHTInfoField1 *) &val8;
 	pHTInfoField1->recommendedTxWidthSet =
-				ht_cap_info->supportedChannelWidthSet;
+				ht_cap_info->supported_channel_width_set;
 	if (cfg_set_int(pMac, WNI_CFG_HT_INFO_FIELD1, *(uint8_t *) pHTInfoField1)
 	    != QDF_STATUS_SUCCESS) {
 		pe_err("could not update HT Info Field");

core/mac/src/pe/lim/lim_process_message_queue.c

@@ -2245,17 +2245,17 @@ handle_ht_capabilityand_ht_info(struct sAniSirGlobal *pMac,
 
 	ht_cap_info = &pMac->mlme_cfg->ht_caps.ht_cap_info;
 	pMac->lim.gHTLsigTXOPProtection =
-		(uint8_t)ht_cap_info->lsigTXOPProtection;
+		(uint8_t)ht_cap_info->l_sig_tx_op_protection;
 	pMac->lim.gHTMIMOPSState =
-		(tSirMacHTMIMOPowerSaveState) ht_cap_info->mimoPowerSave;
-	pMac->lim.gHTGreenfield = (uint8_t)ht_cap_info->greenField;
+		(tSirMacHTMIMOPowerSaveState)ht_cap_info->mimo_power_save;
+	pMac->lim.gHTGreenfield = (uint8_t)ht_cap_info->green_field;
 	pMac->lim.gHTMaxAmsduLength =
-		(uint8_t)ht_cap_info->maximalAMSDUsize;
-	pMac->lim.gHTShortGI20Mhz = (uint8_t)ht_cap_info->shortGI20MHz;
-	pMac->lim.gHTShortGI40Mhz = (uint8_t)ht_cap_info->shortGI40MHz;
+		(uint8_t)ht_cap_info->maximal_amsdu_size;
+	pMac->lim.gHTShortGI20Mhz = (uint8_t)ht_cap_info->short_gi_20_mhz;
+	pMac->lim.gHTShortGI40Mhz = (uint8_t)ht_cap_info->short_gi_40_mhz;
 	pMac->lim.gHTPSMPSupport = (uint8_t)ht_cap_info->psmp;
 	pMac->lim.gHTDsssCckRate40MHzSupport =
-		(uint8_t)ht_cap_info->dsssCckMode40MHz;
+		(uint8_t)ht_cap_info->dsss_cck_mode_40_mhz;
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_HT_AMPDU_PARAMS, &cfgValue) !=
 	    QDF_STATUS_SUCCESS) {

core/mac/src/pe/lim/lim_process_tdls.c

@@ -2036,7 +2036,7 @@ static QDF_STATUS lim_tdls_populate_dot11f_ht_caps(tpAniSirGlobal pMac,
 	tSirMacHTParametersInfo *pHTParametersInfo;
 	union {
 		uint16_t nCfgValue16;
-		struct mlme_ht_capabilities_info htCapInfo;
+		struct mlme_ht_capabilities_info ht_cap_info;
 		tSirMacExtendedHTCapabilityInfo extHtCapInfo;
 	} uHTCapabilityInfo;
 
@@ -2047,23 +2047,23 @@ static QDF_STATUS lim_tdls_populate_dot11f_ht_caps(tpAniSirGlobal pMac,
 
 	uHTCapabilityInfo.nCfgValue16 = nCfgValue & 0xFFFF;
 
-	pDot11f->advCodingCap = uHTCapabilityInfo.htCapInfo.advCodingCap;
-	pDot11f->mimoPowerSave = uHTCapabilityInfo.htCapInfo.mimoPowerSave;
-	pDot11f->greenField = uHTCapabilityInfo.htCapInfo.greenField;
-	pDot11f->shortGI20MHz = uHTCapabilityInfo.htCapInfo.shortGI20MHz;
-	pDot11f->shortGI40MHz = uHTCapabilityInfo.htCapInfo.shortGI40MHz;
-	pDot11f->txSTBC = uHTCapabilityInfo.htCapInfo.txSTBC;
-	pDot11f->rxSTBC = uHTCapabilityInfo.htCapInfo.rxSTBC;
-	pDot11f->delayedBA = uHTCapabilityInfo.htCapInfo.delayedBA;
+	pDot11f->advCodingCap = uHTCapabilityInfo.ht_cap_info.adv_coding_cap;
+	pDot11f->mimoPowerSave = uHTCapabilityInfo.ht_cap_info.mimo_power_save;
+	pDot11f->greenField = uHTCapabilityInfo.ht_cap_info.green_field;
+	pDot11f->shortGI20MHz = uHTCapabilityInfo.ht_cap_info.short_gi_20_mhz;
+	pDot11f->shortGI40MHz = uHTCapabilityInfo.ht_cap_info.short_gi_40_mhz;
+	pDot11f->txSTBC = uHTCapabilityInfo.ht_cap_info.tx_stbc;
+	pDot11f->rxSTBC = uHTCapabilityInfo.ht_cap_info.rx_stbc;
+	pDot11f->delayedBA = uHTCapabilityInfo.ht_cap_info.delayed_ba;
 	pDot11f->maximalAMSDUsize =
-		uHTCapabilityInfo.htCapInfo.maximalAMSDUsize;
+		uHTCapabilityInfo.ht_cap_info.maximal_amsdu_size;
 	pDot11f->dsssCckMode40MHz =
-		uHTCapabilityInfo.htCapInfo.dsssCckMode40MHz;
-	pDot11f->psmp = uHTCapabilityInfo.htCapInfo.psmp;
+		uHTCapabilityInfo.ht_cap_info.dsss_cck_mode_40_mhz;
+	pDot11f->psmp = uHTCapabilityInfo.ht_cap_info.psmp;
 	pDot11f->stbcControlFrame =
-		uHTCapabilityInfo.htCapInfo.stbcControlFrame;
+		uHTCapabilityInfo.ht_cap_info.stbc_control_frame;
 	pDot11f->lsigTXOPProtection =
-		uHTCapabilityInfo.htCapInfo.lsigTXOPProtection;
+		uHTCapabilityInfo.ht_cap_info.l_sig_tx_op_protection;
 
 	/*
 	 * All sessionized entries will need the check below
@@ -2071,7 +2071,8 @@ static QDF_STATUS lim_tdls_populate_dot11f_ht_caps(tpAniSirGlobal pMac,
 	 */
 	if (psessionEntry == NULL) {
 		pDot11f->supportedChannelWidthSet =
-			uHTCapabilityInfo.htCapInfo.supportedChannelWidthSet;
+			uHTCapabilityInfo.ht_cap_info.
+			supported_channel_width_set;
 	} else {
 		pDot11f->supportedChannelWidthSet =
 			psessionEntry->htSupportedChannelWidthSet;

core/mac/src/pe/lim/lim_utils.c

@@ -2790,7 +2790,7 @@ uint8_t lim_get_ht_capability(tpAniSirGlobal pMac,
 		break;
 
 	case eHT_STBC_CONTROL_FRAME:
-		retVal = (uint8_t)ht_cap_info.stbcControlFrame;
+		retVal = (uint8_t)ht_cap_info.stbc_control_frame;
 		break;
 
 	case eHT_PSMP:
@@ -2802,7 +2802,7 @@ uint8_t lim_get_ht_capability(tpAniSirGlobal pMac,
 		break;
 
 	case eHT_MAX_AMSDU_LENGTH:
-		retVal = (uint8_t)ht_cap_info.maximalAMSDUsize;
+		retVal = (uint8_t)ht_cap_info.maximal_amsdu_size;
 		break;
 
 	case eHT_MAX_AMSDU_NUM:
@@ -2819,16 +2819,16 @@ uint8_t lim_get_ht_capability(tpAniSirGlobal pMac,
 
 	case eHT_SHORT_GI_40MHZ:
 		retVal = (uint8_t) (psessionEntry->htConfig.ht_sgi40) ?
-			 ht_cap_info.shortGI40MHz : 0;
+			 ht_cap_info.short_gi_40_mhz : 0;
 		break;
 
 	case eHT_SHORT_GI_20MHZ:
 		retVal = (uint8_t) (psessionEntry->htConfig.ht_sgi20) ?
-			 ht_cap_info.shortGI20MHz : 0;
+			 ht_cap_info.short_gi_20_mhz : 0;
 		break;
 
 	case eHT_GREENFIELD:
-		retVal = (uint8_t)ht_cap_info.greenField;
+		retVal = (uint8_t)ht_cap_info.green_field;
 		break;
 
 	case eHT_MIMO_POWER_SAVE:

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -616,24 +616,24 @@ populate_dot11f_ht_caps(tpAniSirGlobal pMac,
 
 	ht_cap_info = &pMac->mlme_cfg->ht_caps.ht_cap_info;
 
-	pDot11f->mimoPowerSave = ht_cap_info->mimoPowerSave;
-	pDot11f->greenField = ht_cap_info->greenField;
-	pDot11f->delayedBA = ht_cap_info->delayedBA;
-	pDot11f->maximalAMSDUsize = ht_cap_info->maximalAMSDUsize;
-	pDot11f->dsssCckMode40MHz = ht_cap_info->dsssCckMode40MHz;
+	pDot11f->mimoPowerSave = ht_cap_info->mimo_power_save;
+	pDot11f->greenField = ht_cap_info->green_field;
+	pDot11f->delayedBA = ht_cap_info->delayed_ba;
+	pDot11f->maximalAMSDUsize = ht_cap_info->maximal_amsdu_size;
+	pDot11f->dsssCckMode40MHz = ht_cap_info->dsss_cck_mode_40_mhz;
 	pDot11f->psmp = ht_cap_info->psmp;
-	pDot11f->stbcControlFrame = ht_cap_info->stbcControlFrame;
-	pDot11f->lsigTXOPProtection = ht_cap_info->lsigTXOPProtection;
+	pDot11f->stbcControlFrame = ht_cap_info->stbc_control_frame;
+	pDot11f->lsigTXOPProtection = ht_cap_info->l_sig_tx_op_protection;
 
 	/* All sessionized entries will need the check below */
 	if (psessionEntry == NULL) {     /* Only in case of NO session */
 		pDot11f->supportedChannelWidthSet =
-			ht_cap_info->supportedChannelWidthSet;
-		pDot11f->advCodingCap = ht_cap_info->advCodingCap;
-		pDot11f->txSTBC = ht_cap_info->txSTBC;
-		pDot11f->rxSTBC = ht_cap_info->rxSTBC;
-		pDot11f->shortGI20MHz = ht_cap_info->shortGI20MHz;
-		pDot11f->shortGI40MHz = ht_cap_info->shortGI40MHz;
+			ht_cap_info->supported_channel_width_set;
+		pDot11f->advCodingCap = ht_cap_info->adv_coding_cap;
+		pDot11f->txSTBC = ht_cap_info->tx_stbc;
+		pDot11f->rxSTBC = ht_cap_info->rx_stbc;
+		pDot11f->shortGI20MHz = ht_cap_info->short_gi_20_mhz;
+		pDot11f->shortGI40MHz = ht_cap_info->short_gi_40_mhz;
 	} else {
 		pDot11f->advCodingCap = psessionEntry->htConfig.ht_rx_ldpc;
 		pDot11f->supportedChannelWidthSet =

core/sme/src/common/sme_api.c

@@ -12643,7 +12643,7 @@ QDF_STATUS sme_update_nss(tHalHandle h_hal, uint8_t nss)
 			if (CSR_IS_SESSION_VALID(mac_ctx, i)) {
 				csr_session = &mac_ctx->roam.roamSession[i];
 				csr_session->htConfig.ht_tx_stbc =
-					ht_cap_info->txSTBC;
+					ht_cap_info->tx_stbc;
 			}
 		}
 

core/sme/src/csr/csr_api_roam.c

@@ -17443,11 +17443,11 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal mac_ctx,
 	}
 
 	ht_cap_info = &mac_ctx->mlme_cfg->ht_caps.ht_cap_info;
-	session->htConfig.ht_rx_ldpc = ht_cap_info->advCodingCap;
-	session->htConfig.ht_tx_stbc = ht_cap_info->txSTBC;
-	session->htConfig.ht_rx_stbc = ht_cap_info->rxSTBC;
-	session->htConfig.ht_sgi20 = ht_cap_info->shortGI20MHz;
-	session->htConfig.ht_sgi40 = ht_cap_info->shortGI40MHz;
+	session->htConfig.ht_rx_ldpc = ht_cap_info->adv_coding_cap;
+	session->htConfig.ht_tx_stbc = ht_cap_info->tx_stbc;
+	session->htConfig.ht_rx_stbc = ht_cap_info->rx_stbc;
+	session->htConfig.ht_sgi20 = ht_cap_info->short_gi_20_mhz;
+	session->htConfig.ht_sgi40 = ht_cap_info->short_gi_40_mhz;
 
 #ifdef FEATURE_WLAN_BTAMP_UT_RF
 	status = qdf_mc_timer_init(&session->hTimerJoinRetry, QDF_TIMER_TYPE_SW,

core/wma/src/wma_dev_if.c

@@ -2445,7 +2445,7 @@ struct cdp_vdev *wma_vdev_attach(tp_wma_handle wma_handle,
 	ret = wma_vdev_set_param(wma_handle->wmi_handle,
 				 self_sta_req->session_id,
 				 WMI_VDEV_PARAM_TX_STBC,
-				 ht_cap_info->txSTBC);
+				 ht_cap_info->tx_stbc);
 	if (QDF_IS_STATUS_ERROR(ret))
 		WMA_LOGE("Failed to set WMI_VDEV_PARAM_TX_STBC");