qcacld-3.0: Replace typedef tSirSmeNewBssInfo
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 tSirSmeNewBssInfo typedef does
not meet any of those criteria, so replace it (and the "tp" variant)
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: Ia0f75734e6f99f0904bf05cb48d56cdac7d35bd2
CRs-Fixed: 2395000
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 159cc55..3dfad22 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -1154,12 +1154,12 @@
eSIR_SME_AP_CAPS_CHANGED,
} tSirSmeStatusChangeCode;
-typedef struct sSirSmeNewBssInfo {
+struct new_bss_info {
struct qdf_mac_addr bssId;
uint8_t channelNumber;
uint8_t reserved;
tSirMacSSid ssId;
-} tSirSmeNewBssInfo, *tpSirSmeNewBssInfo;
+};
typedef struct sSirSmeApNewCaps {
uint16_t capabilityInfo;
@@ -1208,7 +1208,7 @@
/* eSIR_SME_CHANNEL_SWITCH */
uint8_t newChannelId;
/* eSIR_SME_JOINED_NEW_BSS */
- tSirSmeNewBssInfo newBssInfo;
+ struct new_bss_info newBssInfo;
/* none for eSIR_SME_LEAVING_BSS */
/* none for eSIR_SME_IBSS_ACTIVE */
/* none for eSIR_SME_IBSS_INACTIVE */
diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
index c35a190..f42b523 100644
--- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
+++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
@@ -1286,7 +1286,7 @@
struct pe_session *pe_session)
{
uint8_t infoLen;
- tSirSmeNewBssInfo newBssInfo;
+ struct new_bss_info newBssInfo;
tpAddBssParams pAddBss = (tpAddBssParams) msg;
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 86203e1..0c47656 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
@@ -1310,7 +1310,7 @@
max_info_len = sizeof(tSirSmeApNewCaps);
break;
case eSIR_SME_JOINED_NEW_BSS:
- max_info_len = sizeof(tSirSmeNewBssInfo);
+ max_info_len = sizeof(struct new_bss_info);
break;
default:
max_info_len = sizeof(wm_status_change_ntf->statusChangeInfo);
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 57c0320..8afe4d1 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -394,7 +394,7 @@
bool *pfSameIbss);
static void csr_roam_update_connected_profile_from_new_bss(struct mac_context *mac,
uint32_t sessionId,
- tSirSmeNewBssInfo *
+ struct new_bss_info *
pNewBss);
static ePhyChanBondState csr_get_cb_mode_from_ies(struct mac_context *mac,
uint8_t primaryChn,
@@ -11132,7 +11132,7 @@
#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
static void
csr_roam_diag_joined_new_bss(struct mac_context *mac_ctx,
- tSirSmeNewBssInfo *pNewBss)
+ struct new_bss_info *pNewBss)
{
host_log_ibss_pkt_type *pIbssLog;
uint32_t bi;
@@ -11170,7 +11170,7 @@
tSirSmeApNewCaps *pApNewCaps;
eCsrRoamResult result = eCSR_ROAM_RESULT_NONE;
tSirMacAddr Broadcastaddr = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
- tSirSmeNewBssInfo *pNewBss;
+ struct new_bss_info *pNewBss;
eRoamCmdStatus roamStatus = eCSR_ROAM_FAILED;
qdf_mem_zero(&roam_info, sizeof(roam_info));
@@ -13559,7 +13559,7 @@
static void csr_roam_update_connected_profile_from_new_bss(struct mac_context *mac,
uint32_t sessionId,
- tSirSmeNewBssInfo *pNewBss)
+ struct new_bss_info *pNewBss)
{
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);