Browse Source

qcacld-3.0: Rename HTProfile

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

Change-Id: I9103a9f31a6157134f9ea08ebefbe53bb50a043f
CRs-Fixed: 2393733
Jeff Johnson 6 years ago
parent
commit
f654188f68

+ 2 - 2
core/mac/inc/sir_api.h

@@ -715,7 +715,7 @@ typedef struct sSirSmeStartBssRsp {
 	uint16_t beaconInterval;        /* Beacon Interval for both type */
 	uint32_t staId;         /* Station ID for Self */
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
-	struct ht_profile HTProfile;
+	struct ht_profile ht_profile;
 #endif
 	tSirBssDescription bssDescription;      /* Peer BSS description */
 } tSirSmeStartBssRsp, *tpSirSmeStartBssRsp;
@@ -1034,7 +1034,7 @@ typedef struct sSirSmeJoinRsp {
 	uint32_t max_rate_flags;
 
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
-	struct ht_profile HTProfile;
+	struct ht_profile ht_profile;
 #endif
 	bool supported_nss_1x1;
 	tDot11fIEHTCaps ht_caps;

+ 1 - 1
core/mac/src/pe/lim/lim_api.c

@@ -1902,7 +1902,7 @@ void lim_fill_join_rsp_ht_caps(struct pe_session *session,
 	if (session->cc_switch_mode == QDF_MCC_TO_SCC_SWITCH_DISABLE)
 		return;
 
-	ht_profile = &join_rsp->HTProfile;
+	ht_profile = &join_rsp->ht_profile;
 	ht_profile->htSupportedChannelWidthSet =
 		session->htSupportedChannelWidthSet;
 	ht_profile->htRecommendedTxWidthSet =

+ 9 - 9
core/mac/src/pe/lim/lim_send_sme_rsp_messages.c

@@ -291,7 +291,7 @@ static void lim_handle_join_rsp_status(struct mac_context *mac_ctx,
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 		if (session_entry->cc_switch_mode !=
 				QDF_MCC_TO_SCC_SWITCH_DISABLE) {
-			ht_profile = &sme_join_rsp->HTProfile;
+			ht_profile = &sme_join_rsp->ht_profile;
 			ht_profile->htSupportedChannelWidthSet =
 				session_entry->htSupportedChannelWidthSet;
 			ht_profile->htRecommendedTxWidthSet =
@@ -634,22 +634,22 @@ lim_send_sme_start_bss_rsp(struct mac_context *mac,
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 			if (pe_session->cc_switch_mode
 			    != QDF_MCC_TO_SCC_SWITCH_DISABLE) {
-				pSirSmeRsp->HTProfile.
+				pSirSmeRsp->ht_profile.
 				htSupportedChannelWidthSet =
 					pe_session->htSupportedChannelWidthSet;
-				pSirSmeRsp->HTProfile.htRecommendedTxWidthSet =
+				pSirSmeRsp->ht_profile.htRecommendedTxWidthSet =
 					pe_session->htRecommendedTxWidthSet;
-				pSirSmeRsp->HTProfile.htSecondaryChannelOffset =
+				pSirSmeRsp->ht_profile.htSecondaryChannelOffset =
 					pe_session->htSecondaryChannelOffset;
-				pSirSmeRsp->HTProfile.dot11mode =
+				pSirSmeRsp->ht_profile.dot11mode =
 					pe_session->dot11mode;
-				pSirSmeRsp->HTProfile.htCapability =
+				pSirSmeRsp->ht_profile.htCapability =
 					pe_session->htCapability;
-				pSirSmeRsp->HTProfile.vhtCapability =
+				pSirSmeRsp->ht_profile.vhtCapability =
 					pe_session->vhtCapability;
-				pSirSmeRsp->HTProfile.apCenterChan =
+				pSirSmeRsp->ht_profile.apCenterChan =
 					pe_session->ch_center_freq_seg0;
-				pSirSmeRsp->HTProfile.apChanWidth =
+				pSirSmeRsp->ht_profile.apChanWidth =
 					pe_session->ch_width;
 			}
 #endif

+ 1 - 1
core/sme/inc/csr_api.h

@@ -887,7 +887,7 @@ typedef struct tagCsrRoamConnectedProfile {
 	uint32_t dot11Mode;
 	uint8_t proxyARPService;
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
-	tCsrRoamHTProfile HTProfile;
+	tCsrRoamHTProfile ht_profile;
 #endif
 #ifdef WLAN_FEATURE_11W
 	/* Management Frame Protection */

+ 6 - 6
core/sme/src/csr/csr_api_roam.c

@@ -6536,8 +6536,8 @@ static void csr_roam_process_start_bss_success(struct mac_context *mac_ctx,
 			mac_ctx->roam.configParam.doBMPSWorkaround = 1;
 		}
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
-		dst_profile = &session->connectedProfile.HTProfile;
-		src_profile = &start_bss_rsp->HTProfile;
+		dst_profile = &session->connectedProfile.ht_profile;
+		src_profile = &start_bss_rsp->ht_profile;
 		if (mac_ctx->roam.configParam.cc_switch_mode
 				!= QDF_MCC_TO_SCC_SWITCH_DISABLE)
 			csr_roam_copy_ht_profile(dst_profile, src_profile);
@@ -6995,8 +6995,8 @@ static void csr_roam_process_join_res(struct mac_context *mac_ctx,
 				roam_info.tdls_chan_swit_prohibited);
 #endif
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
-			src_profile = &join_rsp->HTProfile;
-			dst_profile = &conn_profile->HTProfile;
+			src_profile = &join_rsp->ht_profile;
+			dst_profile = &conn_profile->ht_profile;
 			if (mac_ctx->roam.configParam.cc_switch_mode
 				!= QDF_MCC_TO_SCC_SWITCH_DISABLE)
 				csr_roam_copy_ht_profile(dst_profile,
@@ -20889,8 +20889,8 @@ static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx,
 		roam_synch_data->join_rsp->vht_channel_width;
 	csr_roam_fill_tdls_info(mac_ctx, roam_info, roam_synch_data->join_rsp);
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
-	src_profile = &roam_synch_data->join_rsp->HTProfile;
-	dst_profile = &conn_profile->HTProfile;
+	src_profile = &roam_synch_data->join_rsp->ht_profile;
+	dst_profile = &conn_profile->ht_profile;
 	if (mac_ctx->roam.configParam.cc_switch_mode
 			!= QDF_MCC_TO_SCC_SWITCH_DISABLE)
 		csr_roam_copy_ht_profile(dst_profile,

+ 4 - 4
core/sme/src/csr/csr_util.c

@@ -932,13 +932,13 @@ static void csr_handle_conc_chnl_overlap_for_sap_go(struct mac_context *mac_ctx,
 		if (*sap_ch == 0) {
 			*sap_ch = session->connectedProfile.operationChannel;
 			csr_get_ch_from_ht_profile(mac_ctx,
-				&session->connectedProfile.HTProfile,
+				&session->connectedProfile.ht_profile,
 				*sap_ch, sap_cfreq, sap_hbw);
 		} else if (*sap_ch !=
 				session->connectedProfile.operationChannel) {
 			*intf_ch = session->connectedProfile.operationChannel;
 			csr_get_ch_from_ht_profile(mac_ctx,
-					&session->connectedProfile.HTProfile,
+					&session->connectedProfile.ht_profile,
 					*intf_ch, intf_cfreq, intf_hbw);
 		}
 	} else if (*sap_ch == 0 &&
@@ -946,7 +946,7 @@ static void csr_handle_conc_chnl_overlap_for_sap_go(struct mac_context *mac_ctx,
 					QDF_SAP_MODE)) {
 		*sap_ch = session->connectedProfile.operationChannel;
 		csr_get_ch_from_ht_profile(mac_ctx,
-				&session->connectedProfile.HTProfile,
+				&session->connectedProfile.ht_profile,
 				*sap_ch, sap_cfreq, sap_hbw);
 	}
 }
@@ -1012,7 +1012,7 @@ uint16_t csr_check_concurrent_channel_overlap(struct mac_context *mac_ctx,
 				eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED)) {
 			intf_ch = session->connectedProfile.operationChannel;
 			csr_get_ch_from_ht_profile(mac_ctx,
-				&session->connectedProfile.HTProfile,
+				&session->connectedProfile.ht_profile,
 				intf_ch, &intf_cfreq, &intf_hbw);
 			sme_debug("%d: intf_ch:%d intf_cfreq:%d intf_hbw:%d",
 				i, intf_ch, intf_cfreq, intf_hbw);