qcacld-3.0: Rename htConfig

Per the Linux Coding Style mixed-case names are frowned upon, so
rename htConfig to ht_config everywhere it appears.

Change-Id: I3d9478162c0fdc11f30c216cb8a82fbb6b8b85ce
CRs-Fixed: 2393729

core/mac/inc/sir_api.h

@@ -597,7 +597,7 @@ typedef struct sSirSmeStartBssReq {
 	tSirNwType nwType;      /* Indicates 11a/b/g */
 	tSirMacRateSet operationalRateSet;      /* Has 11a or 11b rates */
 	tSirMacRateSet extendedRateSet; /* Has 11g rates */
-	struct ht_config htConfig;
+	struct ht_config ht_config;
 	struct sir_vht_config vht_config;
 #ifdef WLAN_FEATURE_11AX
 	tDot11fIEhe_cap he_config;
@@ -954,7 +954,7 @@ typedef struct sSirSmeJoinReq {
 	bool isFastRoamIniFeatureEnabled;
 
 	uint8_t txLdpcIniFeatureEnabled;
-	struct ht_config htConfig;
+	struct ht_config ht_config;
 	struct sir_vht_config vht_config;
 #ifdef WLAN_FEATURE_11AX
 	tDot11fIEhe_cap he_config;

core/mac/src/pe/include/lim_session.h

@@ -377,7 +377,7 @@ struct pe_session {
 	uint8_t max_amsdu_num;
 	uint8_t isCoalesingInIBSSAllowed;
 
-	struct ht_config htConfig;
+	struct ht_config ht_config;
 	struct sir_vht_config vht_config;
 	/*
 	 * Place holder for StartBssReq message

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

@@ -2472,7 +2472,7 @@ lim_add_sta(struct mac_context *mac_ctx,
 			add_sta_params->nwType = eSIR_11B_NW_TYPE;
 	}
 
-	if (add_sta_params->htCapable && session_entry->htConfig.ht_tx_stbc) {
+	if (add_sta_params->htCapable && session_entry->ht_config.ht_tx_stbc) {
 		struct sDot11fIEHTCaps *ht_caps = (struct sDot11fIEHTCaps *)
 			&add_sta_params->ht_caps;
 		if (ht_caps->rxSTBC)
@@ -2771,8 +2771,8 @@ lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta,
 		pAddStaParams->fDsssCckMode40Mhz =
 			lim_get_ht_capability(mac, eHT_DSSS_CCK_MODE_40MHZ,
 					      pe_session);
-		pAddStaParams->fShortGI20Mhz = pe_session->htConfig.ht_sgi20;
-		pAddStaParams->fShortGI40Mhz = pe_session->htConfig.ht_sgi40;
+		pAddStaParams->fShortGI20Mhz = pe_session->ht_config.ht_sgi20;
+		pAddStaParams->fShortGI40Mhz = pe_session->ht_config.ht_sgi40;
 		pe_debug("greenFieldCapable: %d maxAmpduDensity: %d maxAmpduSize: %d",
 			 pAddStaParams->greenFieldCapable,
 			 pAddStaParams->maxAmpduDensity,
@@ -3731,7 +3731,7 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
 				pAddBssParams->staContext.htCapable,
 				pAddBssParams->staContext.greenFieldCapable,
 				pAddBssParams->staContext.lsigTxopProtection);
-		if (pe_session->htConfig.ht_tx_stbc)
+		if (pe_session->ht_config.ht_tx_stbc)
 			pAddBssParams->staContext.stbc_capable =
 				pAssocRsp->HTCaps.rxSTBC;
 
@@ -3816,14 +3816,14 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
 		 * values are set as 0 in session entry then we will
 		 * hardcode this values to 0.
 		 */
-		if (pe_session->htConfig.ht_sgi20) {
+		if (pe_session->ht_config.ht_sgi20) {
 			pAddBssParams->staContext.fShortGI20Mhz =
 				(uint8_t)pAssocRsp->HTCaps.shortGI20MHz;
 		} else {
 			pAddBssParams->staContext.fShortGI20Mhz = false;
 		}
 
-		if (pe_session->htConfig.ht_sgi40) {
+		if (pe_session->ht_config.ht_sgi40) {
 			pAddBssParams->staContext.fShortGI40Mhz =
 				(uint8_t) pAssocRsp->HTCaps.shortGI40MHz;
 		} else {
@@ -4338,14 +4338,13 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat
 		 * from AP supports. If these values are set as 0 in ini file
 		 * then we will hardcode this values to 0.
 		 */
-		if (true == pe_session->htConfig.ht_sgi20)
+		if (pe_session->ht_config.ht_sgi20)
 			pAddBssParams->staContext.fShortGI20Mhz =
 				(uint8_t)pBeaconStruct->HTCaps.shortGI20MHz;
 		else
-				pAddBssParams->staContext.fShortGI20Mhz =
-					false;
+			pAddBssParams->staContext.fShortGI20Mhz = false;
 
-		if (true == pe_session->htConfig.ht_sgi40)
+		if (pe_session->ht_config.ht_sgi40)
 			pAddBssParams->staContext.fShortGI40Mhz =
 				(uint8_t) pBeaconStruct->HTCaps.shortGI40MHz;
 		else

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

@@ -466,9 +466,7 @@ void lim_handle_ft_pre_auth_rsp(struct mac_context *mac, QDF_STATUS status,
 			pe_err("Invalid bss type");
 
 		ft_session->limPrevSmeState = ft_session->limSmeState;
-		qdf_mem_copy(&(ft_session->htConfig),
-			     &(pe_session->htConfig),
-			     sizeof(pe_session->htConfig));
+		ft_session->ht_config = pe_session->ht_config;
 		ft_session->limSmeState = eLIM_SME_WT_REASSOC_STATE;
 
 		if (IS_5G_CH(pe_session->ftPEContext.pFTPreAuthReq->

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

@@ -1470,7 +1470,7 @@ static bool lim_update_sta_ds(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 		/* assoc_req will be copied to session->parsedAssocReq later */
 		ht_cap_ie = ((uint8_t *) &assoc_req->HTCaps) + 1;
 
-		if (session->htConfig.ht_sgi20) {
+		if (session->ht_config.ht_sgi20) {
 			sta_ds->htShortGI20Mhz =
 				(uint8_t)assoc_req->HTCaps.shortGI20MHz;
 		} else {
@@ -1479,7 +1479,7 @@ static bool lim_update_sta_ds(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 			sta_ds->htShortGI20Mhz = 0;
 		}
 
-		if (session->htConfig.ht_sgi40) {
+		if (session->ht_config.ht_sgi40) {
 			sta_ds->htShortGI40Mhz =
 				(uint8_t)assoc_req->HTCaps.shortGI40MHz;
 		} else {

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

@@ -111,13 +111,13 @@ static void lim_update_stads_htcap(struct mac_context *mac_ctx,
 		/* Check if we have support for gShortGI20Mhz and
 		 * gShortGI40Mhz from ini file
 		 */
-		if (session_entry->htConfig.ht_sgi20)
+		if (session_entry->ht_config.ht_sgi20)
 			sta_ds->htShortGI20Mhz =
 			      (uint8_t)assoc_rsp->HTCaps.shortGI20MHz;
 		else
 			sta_ds->htShortGI20Mhz = false;
 
-		if (session_entry->htConfig.ht_sgi40)
+		if (session_entry->ht_config.ht_sgi40)
 			sta_ds->htShortGI40Mhz =
 				      (uint8_t)assoc_rsp->HTCaps.shortGI40MHz;
 		else

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

@@ -671,16 +671,9 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu
 		}
 		/* Store the session related params in newly created session */
 		session->pLimStartBssReq = sme_start_bss_req;
-
 		session->transactionId = sme_start_bss_req->transactionId;
-
-		qdf_mem_copy(&(session->htConfig),
-			     &(sme_start_bss_req->htConfig),
-			     sizeof(session->htConfig));
-
-		qdf_mem_copy(&(session->vht_config),
-			     &(sme_start_bss_req->vht_config),
-			     sizeof(session->vht_config));
+		session->ht_config = sme_start_bss_req->ht_config;
+		session->vht_config = sme_start_bss_req->vht_config;
 
 		sir_copy_mac_addr(session->selfMacAddr,
 				  sme_start_bss_req->self_macaddr.bytes);
@@ -1383,12 +1376,8 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, uint32_t *msg_buf)
 		session->beaconParams.beaconInterval =
 			bss_desc->beaconInterval;
 
-		qdf_mem_copy(&(session->htConfig), &(sme_join_req->htConfig),
-			sizeof(session->htConfig));
-
-		qdf_mem_copy(&(session->vht_config),
-			&(sme_join_req->vht_config),
-			sizeof(session->vht_config));
+		session->ht_config = sme_join_req->ht_config;
+		session->vht_config = sme_join_req->vht_config;
 
 		/* Copying of bssId is already done, while creating session */
 		sir_copy_mac_addr(session->selfMacAddr,
@@ -3772,19 +3761,19 @@ static void lim_process_sme_update_config(struct mac_context *mac_ctx,
 
 	switch (msg->capab) {
 	case WNI_CFG_HT_CAP_INFO_ADVANCE_CODING:
-		pe_session->htConfig.ht_rx_ldpc = msg->value;
+		pe_session->ht_config.ht_rx_ldpc = msg->value;
 		break;
 	case WNI_CFG_HT_CAP_INFO_TX_STBC:
-		pe_session->htConfig.ht_tx_stbc = msg->value;
+		pe_session->ht_config.ht_tx_stbc = msg->value;
 		break;
 	case WNI_CFG_HT_CAP_INFO_RX_STBC:
-		pe_session->htConfig.ht_rx_stbc = msg->value;
+		pe_session->ht_config.ht_rx_stbc = msg->value;
 		break;
 	case WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ:
-		pe_session->htConfig.ht_sgi20 = msg->value;
+		pe_session->ht_config.ht_sgi20 = msg->value;
 		break;
 	case WNI_CFG_HT_CAP_INFO_SHORT_GI_40MHZ:
-		pe_session->htConfig.ht_sgi40 = msg->value;
+		pe_session->ht_config.ht_sgi40 = msg->value;
 		break;
 	}
 

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

@@ -2536,20 +2536,20 @@ uint8_t lim_get_ht_capability(struct mac_context *mac,
 		break;
 
 	case eHT_RX_STBC:
-		retVal = (uint8_t) pe_session->htConfig.ht_rx_stbc;
+		retVal = (uint8_t) pe_session->ht_config.ht_rx_stbc;
 		break;
 
 	case eHT_TX_STBC:
-		retVal = (uint8_t) pe_session->htConfig.ht_tx_stbc;
+		retVal = (uint8_t) pe_session->ht_config.ht_tx_stbc;
 		break;
 
 	case eHT_SHORT_GI_40MHZ:
-		retVal = (uint8_t)(pe_session->htConfig.ht_sgi40) ?
+		retVal = (uint8_t)(pe_session->ht_config.ht_sgi40) ?
 			mac->mlme_cfg->ht_caps.ht_cap_info.short_gi_40_mhz : 0;
 		break;
 
 	case eHT_SHORT_GI_20MHZ:
-		retVal = (uint8_t)(pe_session->htConfig.ht_sgi20) ?
+		retVal = (uint8_t)(pe_session->ht_config.ht_sgi20) ?
 			mac->mlme_cfg->ht_caps.ht_cap_info.short_gi_20_mhz : 0;
 		break;
 
@@ -2567,7 +2567,7 @@ uint8_t lim_get_ht_capability(struct mac_context *mac,
 		break;
 
 	case eHT_ADVANCED_CODING:
-		retVal = (uint8_t) pe_session->htConfig.ht_rx_ldpc;
+		retVal = (uint8_t) pe_session->ht_config.ht_rx_ldpc;
 		break;
 
 	case eHT_MAX_RX_AMPDU_FACTOR:

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

@@ -624,13 +624,13 @@ populate_dot11f_ht_caps(struct mac_context *mac,
 		pDot11f->shortGI20MHz = ht_cap_info->short_gi_20_mhz;
 		pDot11f->shortGI40MHz = ht_cap_info->short_gi_40_mhz;
 	} else {
-		pDot11f->advCodingCap = pe_session->htConfig.ht_rx_ldpc;
+		pDot11f->advCodingCap = pe_session->ht_config.ht_rx_ldpc;
 		pDot11f->supportedChannelWidthSet =
 			pe_session->htSupportedChannelWidthSet;
-		pDot11f->txSTBC = pe_session->htConfig.ht_tx_stbc;
-		pDot11f->rxSTBC = pe_session->htConfig.ht_rx_stbc;
-		pDot11f->shortGI20MHz = pe_session->htConfig.ht_sgi20;
-		pDot11f->shortGI40MHz = pe_session->htConfig.ht_sgi40;
+		pDot11f->txSTBC = pe_session->ht_config.ht_tx_stbc;
+		pDot11f->rxSTBC = pe_session->ht_config.ht_rx_stbc;
+		pDot11f->shortGI20MHz = pe_session->ht_config.ht_sgi20;
+		pDot11f->shortGI40MHz = pe_session->ht_config.ht_sgi40;
 	}
 
 	/* Ensure that shortGI40MHz is Disabled if supportedChannelWidthSet is
@@ -852,7 +852,7 @@ populate_dot11f_vht_caps(struct mac_context *mac,
 	nCfgValue = 0;
 	/* With VHT it suffices if we just examine HT */
 	if (pe_session) {
-		if (pe_session->htConfig.ht_rx_ldpc)
+		if (pe_session->ht_config.ht_rx_ldpc)
 			pDot11f->ldpcCodingCap =
 				pe_session->vht_config.ldpc_coding;
 		if (pe_session->ch_width < CH_WIDTH_80MHZ) {
@@ -870,10 +870,10 @@ populate_dot11f_vht_caps(struct mac_context *mac,
 				pe_session->vht_config.shortgi160and80plus80;
 		}
 
-		if (pe_session->htConfig.ht_tx_stbc)
+		if (pe_session->ht_config.ht_tx_stbc)
 			pDot11f->txSTBC = pe_session->vht_config.tx_stbc;
 
-		if (pe_session->htConfig.ht_rx_stbc)
+		if (pe_session->ht_config.ht_rx_stbc)
 			pDot11f->rxSTBC = pe_session->vht_config.rx_stbc;
 
 		pDot11f->suBeamformeeCap =

core/sme/inc/csr_internal.h

@@ -656,7 +656,7 @@ struct csr_roam_session {
 	tCsrEseCckmIe suppCckmIeInfo;
 #endif
 	uint8_t bRefAssocStartCnt;      /* Tracking assoc start indication */
-	struct ht_config htConfig;
+	struct ht_config ht_config;
 	struct sir_vht_config vht_config;
 #ifdef WLAN_FEATURE_11AX
 	tDot11fIEhe_cap he_config;

core/sme/src/common/sme_api.c

@@ -8006,15 +8006,15 @@ int16_t sme_get_ht_config(mac_handle_t mac_handle, uint8_t session_id,
 	}
 	switch (ht_capab) {
 	case WNI_CFG_HT_CAP_INFO_ADVANCE_CODING:
-		return pSession->htConfig.ht_rx_ldpc;
+		return pSession->ht_config.ht_rx_ldpc;
 	case WNI_CFG_HT_CAP_INFO_TX_STBC:
-		return pSession->htConfig.ht_tx_stbc;
+		return pSession->ht_config.ht_tx_stbc;
 	case WNI_CFG_HT_CAP_INFO_RX_STBC:
-		return pSession->htConfig.ht_rx_stbc;
+		return pSession->ht_config.ht_rx_stbc;
 	case WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ:
-		return pSession->htConfig.ht_sgi20;
+		return pSession->ht_config.ht_sgi20;
 	case WNI_CFG_HT_CAP_INFO_SHORT_GI_40MHZ:
-		return pSession->htConfig.ht_sgi40;
+		return pSession->ht_config.ht_sgi40;
 	default:
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "invalid ht capability");
@@ -8042,21 +8042,21 @@ int sme_update_ht_config(mac_handle_t mac_handle, uint8_t sessionId,
 
 	switch (htCapab) {
 	case WNI_CFG_HT_CAP_INFO_ADVANCE_CODING:
-		pSession->htConfig.ht_rx_ldpc = value;
+		pSession->ht_config.ht_rx_ldpc = value;
 		break;
 	case WNI_CFG_HT_CAP_INFO_TX_STBC:
-		pSession->htConfig.ht_tx_stbc = value;
+		pSession->ht_config.ht_tx_stbc = value;
 		break;
 	case WNI_CFG_HT_CAP_INFO_RX_STBC:
-		pSession->htConfig.ht_rx_stbc = value;
+		pSession->ht_config.ht_rx_stbc = value;
 		break;
 	case WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ:
 		value = value ? 1 : 0; /* HT SGI can be only 1 or 0 */
-		pSession->htConfig.ht_sgi20 = value;
+		pSession->ht_config.ht_sgi20 = value;
 		break;
 	case WNI_CFG_HT_CAP_INFO_SHORT_GI_40MHZ:
 		value = value ? 1 : 0; /* HT SGI can be only 1 or 0 */
-		pSession->htConfig.ht_sgi40 = value;
+		pSession->ht_config.ht_sgi40 = value;
 		break;
 	}
 
@@ -10991,7 +10991,7 @@ QDF_STATUS sme_update_nss(mac_handle_t mac_handle, uint8_t nss)
 		for (i = 0; i < WLAN_MAX_VDEVS; i++) {
 			if (CSR_IS_SESSION_VALID(mac_ctx, i)) {
 				csr_session = &mac_ctx->roam.roamSession[i];
-				csr_session->htConfig.ht_tx_stbc =
+				csr_session->ht_config.ht_tx_stbc =
 					ht_cap_info->tx_stbc;
 			}
 		}

core/sme/src/csr/csr_api_roam.c

@@ -14058,12 +14058,12 @@ static QDF_STATUS csr_set_ldpc_exception(struct mac_context *mac_ctx,
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (usr_cfg_rx_ldpc && wma_is_rx_ldpc_supported_for_channel(channel)) {
-		session->htConfig.ht_rx_ldpc = 1;
+		session->ht_config.ht_rx_ldpc = 1;
 		session->vht_config.ldpc_coding = 1;
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			"LDPC enable for chnl[%d]", channel);
 	} else {
-		session->htConfig.ht_rx_ldpc = 0;
+		session->ht_config.ht_rx_ldpc = 0;
 		session->vht_config.ldpc_coding = 0;
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			"LDPC disable for chnl[%d]", channel);
@@ -14961,10 +14961,10 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
 					       pBssDescription->channelId,
 					       mac->mlme_cfg->ht_caps.
 					       ht_cap_info.adv_coding_cap);
-		csr_join_req->htConfig = pSession->htConfig;
+		csr_join_req->ht_config = pSession->ht_config;
 		csr_join_req->vht_config = pSession->vht_config;
 		sme_debug("ht capability 0x%x VHT capability 0x%x",
-			(unsigned int)(*(uint32_t *) &csr_join_req->htConfig),
+			(unsigned int)(*(uint32_t *) &csr_join_req->ht_config),
 			(unsigned int)(*(uint32_t *) &csr_join_req->
 			vht_config));
 
@@ -15793,7 +15793,7 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac, uint32_t
 				       ht_cap_info.adv_coding_cap);
 
 	pMsg->vht_config = pSession->vht_config;
-	pMsg->htConfig = pSession->htConfig;
+	pMsg->ht_config = pSession->ht_config;
 
 	value = mac->mlme_cfg->vht_caps.vht_cap_info.su_bformee;
 	pMsg->vht_config.su_beam_formee =
@@ -15804,8 +15804,8 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac, uint32_t
 	pMsg->vht_config.mu_beam_formee = 0;
 
 	sme_debug("ht capability 0x%x VHT capability 0x%x",
-			 (uint32_t)(*(uint32_t *) &pMsg->htConfig),
-			 (uint32_t)(*(uint32_t *) &pMsg->vht_config));
+		  (*(uint32_t *) &pMsg->ht_config),
+		  (*(uint32_t *) &pMsg->vht_config));
 #ifdef WLAN_FEATURE_11W
 	pMsg->pmfCapable = pParam->mfpCapable;
 	pMsg->pmfRequired = pParam->mfpRequired;
@@ -16177,11 +16177,11 @@ QDF_STATUS csr_roam_open_session(struct mac_context *mac_ctx,
 	}
 
 	ht_cap_info = &mac_ctx->mlme_cfg->ht_caps.ht_cap_info;
-	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;
+	session->ht_config.ht_rx_ldpc = ht_cap_info->adv_coding_cap;
+	session->ht_config.ht_tx_stbc = ht_cap_info->tx_stbc;
+	session->ht_config.ht_rx_stbc = ht_cap_info->rx_stbc;
+	session->ht_config.ht_sgi20 = ht_cap_info->short_gi_20_mhz;
+	session->ht_config.ht_sgi40 = ht_cap_info->short_gi_40_mhz;
 
 	session->vht_config.max_mpdu_len = vht_cap_info->ampdu_len;
 	session->vht_config.supported_channel_widthset =