qcacld-3.0: Replace typedef tSirSmeHTProfile
The Linux Coding Style enumerates a few special cases where typedefs
are useful, but stresses "NEVER EVER use a typedef unless you can
clearly match one of those rules." The tSirSmeHTProfile typedef does
not meet any of those criteria, so replace it with a reference to the
underlying struct.
Further note the Linux Coding Style frowns upon mixed-case names and
so-called Hungarian notation, so in conjunction rename the underlying
struct to be in compliance.
Change-Id: I3686dbfadfc144d06267e6162c5642aa61a894fd
CRs-Fixed: 2393734
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index be33a59..69690f0 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -691,7 +691,7 @@
typedef struct bss_description tSirBssDescription, *tpSirBssDescription;
#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
-typedef struct sSirSmeHTProfile {
+struct ht_profile {
uint8_t dot11mode;
uint8_t htCapability;
uint8_t htSupportedChannelWidthSet;
@@ -700,7 +700,7 @@
uint8_t vhtCapability;
uint8_t apCenterChan;
uint8_t apChanWidth;
-} tSirSmeHTProfile;
+};
#endif
/* / Definition for response message to previously */
/* / issued start BSS request */
@@ -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
- tSirSmeHTProfile HTProfile;
+ struct ht_profile HTProfile;
#endif
tSirBssDescription bssDescription; /* Peer BSS description */
} tSirSmeStartBssRsp, *tpSirSmeStartBssRsp;
@@ -1034,7 +1034,7 @@
uint32_t max_rate_flags;
#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
- tSirSmeHTProfile HTProfile;
+ struct ht_profile HTProfile;
#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 66f60bc..bec10d8 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -1885,9 +1885,10 @@
*
* Return: None
*/
-void lim_fill_join_rsp_ht_caps(struct pe_session *session, tpSirSmeJoinRsp join_rsp)
+void lim_fill_join_rsp_ht_caps(struct pe_session *session,
+ tpSirSmeJoinRsp join_rsp)
{
- tSirSmeHTProfile *ht_profile;
+ struct ht_profile *ht_profile;
if (session == NULL) {
pe_err("Invalid Session");
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 08e0eb6..0ffbd88 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
@@ -211,7 +211,7 @@
tpSirSmeJoinReq join_reassoc_req = NULL;
#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
- tSirSmeHTProfile *ht_profile;
+ struct ht_profile *ht_profile;
#endif
if (result_code == eSIR_SME_SUCCESS) {
if (session_entry->beacon != NULL) {
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 5be877d..8383c42 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -6093,7 +6093,7 @@
* Return: None
*/
static void csr_roam_copy_ht_profile(tCsrRoamHTProfile *dst_profile,
- tSirSmeHTProfile *src_profile)
+ struct ht_profile *src_profile)
{
dst_profile->phymode =
csr_roamdot11mode_to_phymode(src_profile->dot11mode);
@@ -6363,7 +6363,7 @@
QDF_STATUS status;
host_log_ibss_pkt_type *ibss_log;
#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
- tSirSmeHTProfile *src_profile = NULL;
+ struct ht_profile *src_profile = NULL;
tCsrRoamHTProfile *dst_profile = NULL;
#endif
@@ -6725,7 +6725,7 @@
struct tag_csrscan_result *scan_res = NULL;
sme_qos_csr_event_indType ind_qos;
#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
- tSirSmeHTProfile *src_profile = NULL;
+ struct ht_profile *src_profile = NULL;
tCsrRoamHTProfile *dst_profile = NULL;
#endif
tCsrRoamConnectedProfile *conn_profile = NULL;
@@ -20613,7 +20613,7 @@
uint32_t pmkid_index;
uint16_t len;
#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
- tSirSmeHTProfile *src_profile = NULL;
+ struct ht_profile *src_profile = NULL;
tCsrRoamHTProfile *dst_profile = NULL;
#endif