qcacld-3.0: Replace typedef tCsrRoamInfo
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 tCsrRoamInfo typedef does not
meet any of those criteria, and the underlying struct is already being
used in some places, so replace all remaining tCsrRoamInfo references
with a reference to the underlying struct.
Change-Id: I1da4b04ec92e176fe28b33d30ec7823828c35c8d
CRs-Fixed: 2140349
diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h
index 299c7c1..8a31c9c 100644
--- a/core/hdd/inc/wlan_hdd_assoc.h
+++ b/core/hdd/inc/wlan_hdd_assoc.h
@@ -249,7 +249,8 @@
*
* Return: QDF_STATUS enumeration
*/
-QDF_STATUS hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *roam_info,
+QDF_STATUS hdd_sme_roam_callback(void *pContext,
+ struct csr_roam_info *roam_info,
uint32_t roamId,
eRoamCmdStatus roamStatus,
eCsrRoamResult roamResult);
@@ -328,9 +329,9 @@
enum ol_txrx_peer_state sta_state,
bool roam_synch_in_progress);
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
-bool hdd_is_roam_sync_in_progress(tCsrRoamInfo *roaminfo);
+bool hdd_is_roam_sync_in_progress(struct csr_roam_info *roaminfo);
#else
-static inline bool hdd_is_roam_sync_in_progress(tCsrRoamInfo *roaminfo)
+static inline bool hdd_is_roam_sync_in_progress(struct csr_roam_info *roaminfo)
{
return false;
}
@@ -364,14 +365,14 @@
* Return: None
*/
void hdd_save_gtk_params(struct hdd_adapter *adapter,
- tCsrRoamInfo *csr_roam_info, bool is_reassoc);
+ struct csr_roam_info *csr_roam_info, bool is_reassoc);
#else
static inline void hdd_wma_send_fastreassoc_cmd(struct hdd_adapter *adapter,
const tSirMacAddr bssid, int channel)
{
}
static inline void hdd_save_gtk_params(struct hdd_adapter *adapter,
- tCsrRoamInfo *csr_roam_info,
+ struct csr_roam_info *csr_roam_info,
bool is_reassoc)
{
}
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index a7a9ae4..b9ced9e 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -2436,7 +2436,7 @@
const u8 *ssid, size_t ssid_len);
void hdd_connect_result(struct net_device *dev, const u8 *bssid,
- tCsrRoamInfo *roam_info, const u8 *req_ie,
+ struct csr_roam_info *roam_info, const u8 *req_ie,
size_t req_ie_len, const u8 *resp_ie,
size_t resp_ie_len, u16 status, gfp_t gfp,
bool connect_timeout,
@@ -2763,12 +2763,13 @@
*
* Return: None
*/
-void hdd_update_hlp_info(struct net_device *dev, tCsrRoamInfo *roam_info);
+void hdd_update_hlp_info(struct net_device *dev,
+ struct csr_roam_info *roam_info);
#else
static inline void hdd_clear_fils_connection_info(struct hdd_adapter *adapter)
{ }
static inline void hdd_update_hlp_info(struct net_device *dev,
- tCsrRoamInfo *roam_info)
+ struct csr_roam_info *roam_info)
{}
#endif
diff --git a/core/hdd/inc/wlan_hdd_wmm.h b/core/hdd/inc/wlan_hdd_wmm.h
index 67362e5..d8d1034 100644
--- a/core/hdd/inc/wlan_hdd_wmm.h
+++ b/core/hdd/inc/wlan_hdd_wmm.h
@@ -317,7 +317,8 @@
* Return: QDF_STATUS enumeration
*/
QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info, eCsrRoamBssType eBssType);
+ struct csr_roam_info *roam_info,
+ eCsrRoamBssType eBssType);
/**
* hdd_wmm_connect() - Function which will handle the housekeeping
@@ -330,7 +331,8 @@
* Return: QDF_STATUS enumeration
*/
QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info, eCsrRoamBssType eBssType);
+ struct csr_roam_info *roam_info,
+ eCsrRoamBssType eBssType);
/**
* hdd_wmm_get_uapsd_mask() - Function which will calculate the
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index 505bb39..3c3ab8f 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -354,7 +354,7 @@
* Return: None
*/
static void hdd_copy_ht_caps(struct hdd_station_ctx *hdd_sta_ctx,
- tCsrRoamInfo *roam_info)
+ struct csr_roam_info *roam_info)
{
tDot11fIEHTCaps *roam_ht_cap = &roam_info->ht_caps;
struct ieee80211_ht_cap *hdd_ht_cap = &hdd_sta_ctx->conn_info.ht_caps;
@@ -548,7 +548,7 @@
* Return: None
*/
static void hdd_copy_vht_caps(struct hdd_station_ctx *hdd_sta_ctx,
- tCsrRoamInfo *roam_info)
+ struct csr_roam_info *roam_info)
{
tDot11fIEVHTCaps *roam_vht_cap = &roam_info->vht_caps;
struct ieee80211_vht_cap *hdd_vht_cap =
@@ -663,7 +663,7 @@
* Return: None
*/
static void hdd_copy_ht_operation(struct hdd_station_ctx *hdd_sta_ctx,
- tCsrRoamInfo *roam_info)
+ struct csr_roam_info *roam_info)
{
tDot11fIEHTInfo *roam_ht_ops = &roam_info->ht_operation;
struct ieee80211_ht_operation *hdd_ht_ops =
@@ -776,7 +776,7 @@
* Return: None
*/
static void hdd_copy_vht_operation(struct hdd_station_ctx *hdd_sta_ctx,
- tCsrRoamInfo *roam_info)
+ struct csr_roam_info *roam_info)
{
tDot11fIEVHTOperation *roam_vht_ops = &roam_info->vht_operation;
struct ieee80211_vht_operation *hdd_vht_ops =
@@ -798,7 +798,7 @@
* Return: None
*/
static void hdd_save_bss_info(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info)
+ struct csr_roam_info *roam_info)
{
struct hdd_station_ctx *hdd_sta_ctx =
WLAN_HDD_GET_STATION_CTX_PTR(adapter);
@@ -850,7 +850,8 @@
* Return: none
*/
static void
-hdd_conn_save_connect_info(struct hdd_adapter *adapter, tCsrRoamInfo *roam_info,
+hdd_conn_save_connect_info(struct hdd_adapter *adapter,
+ struct csr_roam_info *roam_info,
eCsrRoamBssType eBssType)
{
struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
@@ -953,7 +954,7 @@
static void
hdd_send_ft_assoc_response(struct net_device *dev,
struct hdd_adapter *adapter,
- tCsrRoamInfo *pCsrRoamInfo)
+ struct csr_roam_info *pCsrRoamInfo)
{
union iwreq_data wrqu;
char *buff;
@@ -1117,7 +1118,7 @@
static void
hdd_send_new_ap_channel_info(struct net_device *dev,
struct hdd_adapter *adapter,
- tCsrRoamInfo *pCsrRoamInfo)
+ struct csr_roam_info *pCsrRoamInfo)
{
union iwreq_data wrqu;
struct bss_description *descriptor = pCsrRoamInfo->pBssDesc;
@@ -1150,7 +1151,7 @@
*/
static void
hdd_send_update_beacon_ies_event(struct hdd_adapter *adapter,
- tCsrRoamInfo *pCsrRoamInfo)
+ struct csr_roam_info *pCsrRoamInfo)
{
union iwreq_data wrqu;
u8 *beacon_ies;
@@ -1222,7 +1223,7 @@
* Return: none
*/
static void hdd_send_association_event(struct net_device *dev,
- tCsrRoamInfo *pCsrRoamInfo)
+ struct csr_roam_info *pCsrRoamInfo)
{
int ret;
struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
@@ -1572,7 +1573,7 @@
* Return: QDF_STATUS enumeration
*/
static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info,
+ struct csr_roam_info *roam_info,
uint32_t roamId,
eRoamCmdStatus roamStatus,
eCsrRoamResult roamResult)
@@ -1914,7 +1915,7 @@
* Return: QDF_STATUS enumeration
*/
QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info,
+ struct csr_roam_info *roam_info,
uint8_t staId,
struct qdf_mac_addr *pPeerMacAddress,
struct bss_description *pBssDesc)
@@ -2053,7 +2054,7 @@
#if defined(WLAN_FEATURE_ROAM_OFFLOAD)
#if defined(WLAN_FEATURE_FILS_SK)
void hdd_save_gtk_params(struct hdd_adapter *adapter,
- tCsrRoamInfo *csr_roam_info, bool is_reassoc)
+ struct csr_roam_info *csr_roam_info, bool is_reassoc)
{
uint8_t *kek;
uint32_t kek_len;
@@ -2078,7 +2079,7 @@
}
#else
void hdd_save_gtk_params(struct hdd_adapter *adapter,
- tCsrRoamInfo *csr_roam_info, bool is_reassoc)
+ struct csr_roam_info *csr_roam_info, bool is_reassoc)
{
uint8_t *kek;
uint32_t kek_len;
@@ -2108,7 +2109,7 @@
* Return: none
*/
static void hdd_send_re_assoc_event(struct net_device *dev,
- struct hdd_adapter *adapter, tCsrRoamInfo *pCsrRoamInfo,
+ struct hdd_adapter *adapter, struct csr_roam_info *pCsrRoamInfo,
uint8_t *reqRsnIe, uint32_t reqRsnLength)
{
unsigned int len = 0;
@@ -2260,7 +2261,7 @@
* Return: roam sync status if roaming offloaded else false
*/
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
-bool hdd_is_roam_sync_in_progress(tCsrRoamInfo *roaminfo)
+bool hdd_is_roam_sync_in_progress(struct csr_roam_info *roaminfo)
{
if (roaminfo)
return roaminfo->roamSynchInProgress;
@@ -2281,7 +2282,7 @@
* Return: sta_id (HDD_WLAN_INVALID_STA_ID if peer not found).
*/
static uint8_t hdd_get_ibss_peer_staid(struct hdd_station_ctx *hddstactx,
- tCsrRoamInfo *roaminfo)
+ struct csr_roam_info *roaminfo)
{
uint8_t staid = HDD_WLAN_INVALID_STA_ID;
QDF_STATUS status;
@@ -2312,7 +2313,7 @@
* Return: 0 on success and errno on failure
*/
static int hdd_change_sta_state_authenticated(struct hdd_adapter *adapter,
- tCsrRoamInfo *roaminfo)
+ struct csr_roam_info *roaminfo)
{
QDF_STATUS status;
uint32_t timeout;
@@ -2386,7 +2387,8 @@
* Return: None
*/
static void hdd_change_peer_state_after_set_key(struct hdd_adapter *adapter,
- tCsrRoamInfo *roaminfo, eCsrRoamResult roam_result)
+ struct csr_roam_info *roaminfo,
+ eCsrRoamResult roam_result)
{
struct hdd_station_ctx *hdd_sta_ctx =
WLAN_HDD_GET_STATION_CTX_PTR(adapter);
@@ -2455,11 +2457,12 @@
*
* Return: QDF_STATUS enumeration
*/
-static QDF_STATUS hdd_roam_set_key_complete_handler(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info,
- uint32_t roamId,
- eRoamCmdStatus roamStatus,
- eCsrRoamResult roamResult)
+static QDF_STATUS
+hdd_roam_set_key_complete_handler(struct hdd_adapter *adapter,
+ struct csr_roam_info *roam_info,
+ uint32_t roamId,
+ eRoamCmdStatus roamStatus,
+ eCsrRoamResult roamResult)
{
eCsrEncryptionType connectedCipherAlgo;
bool fConnected = false;
@@ -2502,7 +2505,7 @@
{
QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
- tCsrRoamInfo roamInfo;
+ struct csr_roam_info roamInfo;
roamInfo.fAuthRequired = false;
qdf_mem_copy(roamInfo.bssid.bytes,
@@ -2559,7 +2562,7 @@
*/
static QDF_STATUS
hdd_association_completion_handler(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info,
+ struct csr_roam_info *roam_info,
uint32_t roamId,
eRoamCmdStatus roamStatus,
eCsrRoamResult roamResult)
@@ -3243,7 +3246,7 @@
* Return: none
*/
static void hdd_roam_ibss_indication_handler(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info,
+ struct csr_roam_info *roam_info,
uint32_t roamId,
eRoamCmdStatus roamStatus,
eCsrRoamResult roamResult)
@@ -3512,7 +3515,7 @@
* Return: QDF_STATUS enumeration
*/
static QDF_STATUS roam_ibss_connect_handler(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info)
+ struct csr_roam_info *roam_info)
{
struct cfg80211_bss *bss;
/*
@@ -3554,7 +3557,7 @@
*/
static void
hdd_roam_mic_error_indication_handler(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info)
+ struct csr_roam_info *roam_info)
{
struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
tSirMicFailureInfo *mic_failure_info;
@@ -3587,7 +3590,7 @@
*/
static QDF_STATUS
roam_roam_connect_status_update_handler(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info,
+ struct csr_roam_info *roam_info,
uint32_t roamId,
eRoamCmdStatus roamStatus,
eCsrRoamResult roamResult)
@@ -3832,7 +3835,7 @@
static inline QDF_STATUS
hdd_roam_tdls_status_update_handler(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info,
+ struct csr_roam_info *roam_info,
uint32_t roamId,
eRoamCmdStatus roamStatus,
eCsrRoamResult roamResult)
@@ -3973,7 +3976,8 @@
* Return: none
*/
static void
-hdd_indicate_cckm_pre_auth(struct hdd_adapter *adapter, tCsrRoamInfo *roam_info)
+hdd_indicate_cckm_pre_auth(struct hdd_adapter *adapter,
+ struct csr_roam_info *roam_info)
{
union iwreq_data wrqu;
char buf[IW_CUSTOM_MAX + 1];
@@ -4020,7 +4024,7 @@
*/
static void
hdd_indicate_ese_adj_ap_rep_ind(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info)
+ struct csr_roam_info *roam_info)
{
union iwreq_data wrqu;
char buf[IW_CUSTOM_MAX + 1];
@@ -4096,7 +4100,7 @@
*/
static void
hdd_indicate_ese_bcn_report_ind(const struct hdd_adapter *adapter,
- const tCsrRoamInfo *roam_info)
+ const struct csr_roam_info *roam_info)
{
union iwreq_data wrqu;
char buf[IW_CUSTOM_MAX];
@@ -4333,7 +4337,7 @@
* Return: None
*/
static void hdd_roam_channel_switch_handler(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info)
+ struct csr_roam_info *roam_info)
{
struct hdd_chan_change_params chan_change;
struct cfg80211_bss *bss;
@@ -4387,7 +4391,8 @@
* Return: QDF_STATUS enumeration
*/
QDF_STATUS
-hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *roam_info, uint32_t roamId,
+hdd_sme_roam_callback(void *pContext, struct csr_roam_info *roam_info,
+ uint32_t roamId,
eRoamCmdStatus roamStatus, eCsrRoamResult roamResult)
{
QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 816f5a2..22b44b9 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -5580,8 +5580,9 @@
*
* Return: zero on success, error code on failure
*/
-static int wlan_hdd_add_fils_params_roam_auth_event(struct sk_buff *skb,
- tCsrRoamInfo *roam_info)
+static int
+wlan_hdd_add_fils_params_roam_auth_event(struct sk_buff *skb,
+ struct csr_roam_info *roam_info)
{
if (roam_info->pmk_len &&
nla_put(skb, QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_PMK,
@@ -5610,9 +5611,9 @@
return 0;
}
#else
-static inline int wlan_hdd_add_fils_params_roam_auth_event(struct sk_buff *skb,
- tCsrRoamInfo
- *roam_info)
+static inline int
+wlan_hdd_add_fils_params_roam_auth_event(struct sk_buff *skb,
+ struct csr_roam_info *roam_info)
{
return 0;
}
@@ -5648,7 +5649,7 @@
*/
int wlan_hdd_send_roam_auth_event(struct hdd_adapter *adapter, uint8_t *bssid,
uint8_t *req_rsn_ie, uint32_t req_rsn_len, uint8_t *rsp_rsn_ie,
- uint32_t rsp_rsn_len, tCsrRoamInfo *roam_info_ptr)
+ uint32_t rsp_rsn_len, struct csr_roam_info *roam_info_ptr)
{
struct hdd_context *hdd_ctx_ptr = WLAN_HDD_GET_CTX(adapter);
struct sk_buff *skb = NULL;
@@ -15137,8 +15138,9 @@
*
* Return: struct cfg80211_bss pointer
*/
-struct cfg80211_bss *wlan_hdd_cfg80211_update_bss_db(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info)
+struct cfg80211_bss *
+wlan_hdd_cfg80211_update_bss_db(struct hdd_adapter *adapter,
+ struct csr_roam_info *roam_info)
{
tCsrRoamConnectedProfile roamProfile;
tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter);
@@ -15274,7 +15276,7 @@
* Return: 0 for success, non-zero for failure
*/
int wlan_hdd_cfg80211_pmksa_candidate_notify(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info,
+ struct csr_roam_info *roam_info,
int index, bool preauth)
{
struct net_device *dev = adapter->dev;
@@ -15306,8 +15308,9 @@
* Return: QDF status
*/
#define MAX_LFR_METRICS_EVENT_LENGTH 100
-QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info)
+QDF_STATUS
+wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter,
+ struct csr_roam_info *roam_info)
{
unsigned char metrics_notification[MAX_LFR_METRICS_EVENT_LENGTH + 1];
union iwreq_data wrqu;
@@ -15349,7 +15352,7 @@
*/
QDF_STATUS
wlan_hdd_cfg80211_roam_metrics_preauth_status(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info,
+ struct csr_roam_info *roam_info,
bool preauth_status)
{
unsigned char metrics_notification[MAX_LFR_METRICS_EVENT_LENGTH + 1];
@@ -15397,8 +15400,9 @@
*
* Return: QDF status
*/
-QDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info)
+QDF_STATUS
+wlan_hdd_cfg80211_roam_metrics_handover(struct hdd_adapter *adapter,
+ struct csr_roam_info *roam_info)
{
unsigned char metrics_notification[MAX_LFR_METRICS_EVENT_LENGTH + 1];
union iwreq_data wrqu;
diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h
index 9ed38ca..9c866e0 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.h
+++ b/core/hdd/src/wlan_hdd_cfg80211.h
@@ -211,29 +211,32 @@
#define CFG_PROPAGATION_DELAY_BASE (64)
#define CFG_AGG_RETRY_MIN (5)
-struct cfg80211_bss *wlan_hdd_cfg80211_update_bss_db(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info);
+struct cfg80211_bss *
+wlan_hdd_cfg80211_update_bss_db(struct hdd_adapter *adapter,
+ struct csr_roam_info *roam_info);
int wlan_hdd_cfg80211_pmksa_candidate_notify(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info,
+ struct csr_roam_info *roam_info,
int index, bool preauth);
#ifdef FEATURE_WLAN_LFR_METRICS
-QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info);
+QDF_STATUS
+wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter,
+ struct csr_roam_info *roam_info);
-QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth_status(struct hdd_adapter *
- adapter,
- tCsrRoamInfo *
- roam_info,
- bool preauth_status);
+QDF_STATUS
+wlan_hdd_cfg80211_roam_metrics_preauth_status(struct hdd_adapter *adapter,
+ struct csr_roam_info *roam_info,
+ bool preauth_status);
-QDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info);
+QDF_STATUS
+wlan_hdd_cfg80211_roam_metrics_handover(struct hdd_adapter *adapter,
+ struct csr_roam_info *roam_info);
#endif
#ifdef FEATURE_WLAN_WAPI
-void wlan_hdd_cfg80211_set_key_wapi(struct hdd_adapter *adapter, uint8_t key_index,
+void wlan_hdd_cfg80211_set_key_wapi(struct hdd_adapter *adapter,
+ uint8_t key_index,
const uint8_t *mac_addr, const uint8_t *key,
int key_Len);
#endif
@@ -333,9 +336,11 @@
*
* Return: 0 on success or failure reason
*/
-int wlan_hdd_send_hang_reason_event(struct hdd_context *hdd_ctx, uint32_t reason);
+int wlan_hdd_send_hang_reason_event(struct hdd_context *hdd_ctx,
+ uint32_t reason);
-int wlan_hdd_send_avoid_freq_for_dnbs(struct hdd_context *hdd_ctx, uint8_t op_chan);
+int wlan_hdd_send_avoid_freq_for_dnbs(struct hdd_context *hdd_ctx,
+ uint8_t op_chan);
#ifdef FEATURE_WLAN_EXTSCAN
void wlan_hdd_cfg80211_extscan_callback(void *ctx,
@@ -357,25 +362,26 @@
void hdd_rssi_threshold_breached(void *hddctx,
struct rssi_breach_event *data);
-struct cfg80211_bss *wlan_hdd_cfg80211_update_bss_list(struct hdd_adapter *adapter,
- tSirMacAddr bssid);
+struct cfg80211_bss *
+wlan_hdd_cfg80211_update_bss_list(struct hdd_adapter *adapter,
+ tSirMacAddr bssid);
int wlan_hdd_cfg80211_update_bss(struct wiphy *wiphy,
- struct hdd_adapter *adapter,
- uint32_t scan_timestamp);
+ struct hdd_adapter *adapter,
+ uint32_t scan_timestamp);
void wlan_hdd_cfg80211_acs_ch_select_evt(struct hdd_adapter *adapter);
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
int wlan_hdd_send_roam_auth_event(struct hdd_adapter *adapter, uint8_t *bssid,
uint8_t *req_rsn_ie, uint32_t req_rsn_length, uint8_t
- *rsp_rsn_ie, uint32_t rsp_rsn_length, tCsrRoamInfo
+ *rsp_rsn_ie, uint32_t rsp_rsn_length, struct csr_roam_info
*roam_info_ptr);
#else
static inline int wlan_hdd_send_roam_auth_event(struct hdd_adapter *adapter,
uint8_t *bssid, uint8_t *req_rsn_ie, uint32_t req_rsn_length,
- uint8_t *rsp_rsn_ie, uint32_t rsp_rsn_length, tCsrRoamInfo
- *roam_info_ptr)
+ uint8_t *rsp_rsn_ie, uint32_t rsp_rsn_length,
+ struct csr_roam_info *roam_info_ptr)
{
return 0;
}
@@ -391,7 +397,8 @@
int wlan_hdd_enable_dfs_chan_scan(struct hdd_context *hdd_ctx,
bool enable_dfs_channels);
-int wlan_hdd_cfg80211_update_band(struct hdd_context *hdd_ctx, struct wiphy *wiphy,
+int wlan_hdd_cfg80211_update_band(struct hdd_context *hdd_ctx,
+ struct wiphy *wiphy,
eCsrBand eBand);
/**
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 8105afa..5bf756a 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -4881,7 +4881,8 @@
{ }
#endif
-void hdd_update_hlp_info(struct net_device *dev, tCsrRoamInfo *roam_info)
+void hdd_update_hlp_info(struct net_device *dev,
+ struct csr_roam_info *roam_info)
{
struct sk_buff *skb;
uint16_t skb_len;
@@ -4965,7 +4966,8 @@
* Return: None
*/
static void hdd_connect_done(struct net_device *dev, const u8 *bssid,
- struct cfg80211_bss *bss, tCsrRoamInfo *roam_info,
+ struct cfg80211_bss *bss,
+ struct csr_roam_info *roam_info,
const u8 *req_ie, size_t req_ie_len,
const u8 *resp_ie, size_t resp_ie_len, u16 status,
gfp_t gfp, bool connect_timeout,
@@ -5016,7 +5018,7 @@
#else
static inline void
hdd_connect_done(struct net_device *dev, const u8 *bssid,
- struct cfg80211_bss *bss, tCsrRoamInfo *roam_info,
+ struct cfg80211_bss *bss, struct csr_roam_info *roam_info,
const u8 *req_ie, size_t req_ie_len,
const u8 *resp_ie, size_t resp_ie_len, u16 status,
gfp_t gfp, bool connect_timeout,
@@ -5051,7 +5053,7 @@
static int hdd_fils_update_connect_results(struct net_device *dev,
const u8 *bssid,
struct cfg80211_bss *bss,
- tCsrRoamInfo *roam_info, const u8 *req_ie,
+ struct csr_roam_info *roam_info, const u8 *req_ie,
size_t req_ie_len, const u8 *resp_ie,
size_t resp_ie_len, u16 status, gfp_t gfp,
bool connect_timeout,
@@ -5070,7 +5072,7 @@
static inline int hdd_fils_update_connect_results(struct net_device *dev,
const u8 *bssid,
struct cfg80211_bss *bss,
- tCsrRoamInfo *roam_info, const u8 *req_ie,
+ struct csr_roam_info *roam_info, const u8 *req_ie,
size_t req_ie_len, const u8 *resp_ie,
size_t resp_ie_len, u16 status, gfp_t gfp,
bool connect_timeout,
@@ -5100,7 +5102,7 @@
* Return: Void
*/
void hdd_connect_result(struct net_device *dev, const u8 *bssid,
- tCsrRoamInfo *roam_info, const u8 *req_ie,
+ struct csr_roam_info *roam_info, const u8 *req_ie,
size_t req_ie_len, const u8 *resp_ie,
size_t resp_ie_len, u16 status, gfp_t gfp,
bool connect_timeout,
@@ -5141,7 +5143,7 @@
}
#else
void hdd_connect_result(struct net_device *dev, const u8 *bssid,
- tCsrRoamInfo *roam_info, const u8 *req_ie,
+ struct csr_roam_info *roam_info, const u8 *req_ie,
size_t req_ie_len, const u8 *resp_ie,
size_t resp_ie_len, u16 status, gfp_t gfp,
bool connect_timeout,
diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c
index b6b15e8..808330d 100644
--- a/core/hdd/src/wlan_hdd_nan_datapath.c
+++ b/core/hdd/src/wlan_hdd_nan_datapath.c
@@ -881,7 +881,7 @@
uint32_t create_reason = NDP_NAN_DATA_IFACE_CREATE_FAILED;
struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
struct qdf_mac_addr bc_mac_addr = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
- tCsrRoamInfo *roam_info;
+ struct csr_roam_info *roam_info;
struct bss_description tmp_bss_descp = {0};
ENTER();
@@ -1242,7 +1242,7 @@
struct sme_ndp_peer_ind *new_peer_ind = ind_params;
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
struct bss_description tmp_bss_descp = {0};
- tCsrRoamInfo *roam_info;
+ struct csr_roam_info *roam_info;
struct nan_datapath_ctx *ndp_ctx = WLAN_HDD_GET_NDP_CTX_PTR(adapter);
struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
@@ -1843,8 +1843,9 @@
* Return: none
*/
void hdd_ndp_event_handler(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info, uint32_t roam_id, eRoamCmdStatus roam_status,
- eCsrRoamResult roam_result)
+ struct csr_roam_info *roam_info,
+ uint32_t roam_id, eRoamCmdStatus roam_status,
+ eCsrRoamResult roam_result)
{
if (roam_status == eCSR_ROAM_NDP_STATUS_UPDATE) {
switch (roam_result) {
@@ -1897,8 +1898,9 @@
}
#else
void hdd_ndp_event_handler(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info, uint32_t roam_id, eRoamCmdStatus roam_status,
- eCsrRoamResult roam_result)
+ struct csr_roam_info *roam_info,
+ uint32_t roam_id, eRoamCmdStatus roam_status,
+ eCsrRoamResult roam_result)
{
bool success;
struct wlan_objmgr_psoc *psoc = wlan_vdev_get_psoc(adapter->hdd_vdev);
@@ -2281,7 +2283,7 @@
void hdd_ndi_drv_ndi_create_rsp_handler(uint8_t vdev_id,
struct nan_datapath_inf_create_rsp *ndi_rsp)
{
- tCsrRoamInfo roam_info = {0};
+ struct csr_roam_info roam_info = {0};
struct bss_description tmp_bss_descp = {0};
struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
struct hdd_adapter *adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id);
@@ -2356,7 +2358,7 @@
struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
struct hdd_adapter *adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id);
struct bss_description tmp_bss_descp = {0};
- tCsrRoamInfo roam_info = {0};
+ struct csr_roam_info roam_info = {0};
struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
ENTER();
diff --git a/core/hdd/src/wlan_hdd_nan_datapath.h b/core/hdd/src/wlan_hdd_nan_datapath.h
index 59c67c5..e4c951a 100644
--- a/core/hdd/src/wlan_hdd_nan_datapath.h
+++ b/core/hdd/src/wlan_hdd_nan_datapath.h
@@ -213,8 +213,9 @@
void hdd_nan_datapath_target_config(struct hdd_context *hdd_ctx,
struct wma_tgt_cfg *cfg);
void hdd_ndp_event_handler(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info, uint32_t roam_id, eRoamCmdStatus roam_status,
- eCsrRoamResult roam_result);
+ struct csr_roam_info *roam_info,
+ uint32_t roam_id, eRoamCmdStatus roam_status,
+ eCsrRoamResult roam_result);
int wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy,
struct wireless_dev *wdev, const void *data, int data_len);
int hdd_init_nan_data_mode(struct hdd_adapter *adapter);
@@ -228,8 +229,10 @@
{
}
static inline void hdd_ndp_event_handler(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info, uint32_t roam_id, eRoamCmdStatus roam_status,
- eCsrRoamResult roam_result)
+ struct csr_roam_info *roam_info,
+ uint32_t roam_id,
+ eRoamCmdStatus roam_status,
+ eCsrRoamResult roam_result)
{
}
static inline int wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy,
diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c
index b6a50a6..101aea2 100644
--- a/core/hdd/src/wlan_hdd_wmm.c
+++ b/core/hdd/src/wlan_hdd_wmm.c
@@ -1795,7 +1795,8 @@
* Return: QDF_STATUS enumeration
*/
QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info, eCsrRoamBssType eBssType)
+ struct csr_roam_info *roam_info,
+ eCsrRoamBssType eBssType)
{
uint8_t uapsdMask;
QDF_STATUS status;
@@ -1913,7 +1914,8 @@
* Return: QDF_STATUS enumeration
*/
QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter,
- tCsrRoamInfo *roam_info, eCsrRoamBssType eBssType)
+ struct csr_roam_info *roam_info,
+ eCsrRoamBssType eBssType)
{
int ac;
bool qap;