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
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 69690f0..422bb35 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -715,7 +715,7 @@
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 @@
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;
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index bec10d8..42709b7 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -1902,7 +1902,7 @@
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 =
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index 0ffbd88..14726fa 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -291,7 +291,7 @@
#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 @@
#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
diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h
index 28197d2..a666f4e 100644
--- a/core/sme/inc/csr_api.h
+++ b/core/sme/inc/csr_api.h
@@ -887,7 +887,7 @@
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 */
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 8383c42..316f3ea 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -6536,8 +6536,8 @@
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 @@
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 @@
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,
diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c
index 5e22137..f10e4a2 100644
--- a/core/sme/src/csr/csr_util.c
+++ b/core/sme/src/csr/csr_util.c
@@ -932,13 +932,13 @@
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 @@
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 @@
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);