From 40dae4e63bb7aa837d1e5b764d831c2b2f2f5f6b Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Tue, 29 Aug 2017 14:00:25 -0700 Subject: [PATCH] qcacld-3.0: Replace typedef hdd_station_ctx_t 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 hdd_station_ctx_t typedef does not meet any of those criteria, so replace it with a well named struct. Change-Id: Idaa9c96dc757465d120b33c686d102ef29b31ca4 CRs-Fixed: 2101019 --- core/hdd/inc/wlan_hdd_assoc.h | 14 ++--- core/hdd/inc/wlan_hdd_main.h | 2 +- core/hdd/inc/wlan_hdd_tx_rx.h | 4 +- core/hdd/src/wlan_hdd_assoc.c | 80 ++++++++++++++-------------- core/hdd/src/wlan_hdd_cfg80211.c | 54 +++++++++---------- core/hdd/src/wlan_hdd_hostapd.c | 6 +-- core/hdd/src/wlan_hdd_ioctl.c | 18 +++---- core/hdd/src/wlan_hdd_ipa.c | 4 +- core/hdd/src/wlan_hdd_lpass.c | 2 +- core/hdd/src/wlan_hdd_main.c | 12 ++--- core/hdd/src/wlan_hdd_nan_datapath.c | 24 ++++----- core/hdd/src/wlan_hdd_ocb.c | 2 +- core/hdd/src/wlan_hdd_power.c | 6 +-- core/hdd/src/wlan_hdd_stats.c | 10 ++-- core/hdd/src/wlan_hdd_tdls.c | 16 +++--- core/hdd/src/wlan_hdd_tsf.c | 4 +- core/hdd/src/wlan_hdd_tx_rx.c | 12 ++--- core/hdd/src/wlan_hdd_wext.c | 52 +++++++++--------- 18 files changed, 161 insertions(+), 161 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h index 12db9f3ae648..062eb08530ee 100644 --- a/core/hdd/inc/wlan_hdd_assoc.h +++ b/core/hdd/inc/wlan_hdd_assoc.h @@ -214,7 +214,7 @@ struct hdd_connection_info { /* Forward declarations */ typedef struct hdd_adapter hdd_adapter_t; -typedef struct hdd_station_ctx hdd_station_ctx_t; +struct hdd_station_ctx; /** * hdd_is_connecting() - Function to check connection progress @@ -222,7 +222,7 @@ typedef struct hdd_station_ctx hdd_station_ctx_t; * * Return: true if connecting, false otherwise */ -bool hdd_is_connecting(hdd_station_ctx_t *hdd_sta_ctx); +bool hdd_is_connecting(struct hdd_station_ctx *hdd_sta_ctx); /** * hdd_conn_is_connected() - Function to check connection status @@ -230,7 +230,7 @@ bool hdd_is_connecting(hdd_station_ctx_t *hdd_sta_ctx); * * Return: false if any errors encountered, true otherwise */ -bool hdd_conn_is_connected(hdd_station_ctx_t *pHddStaCtx); +bool hdd_conn_is_connected(struct hdd_station_ctx *pHddStaCtx); /** * hdd_conn_get_connected_band() - get current connection radio band @@ -239,7 +239,7 @@ bool hdd_conn_is_connected(hdd_station_ctx_t *pHddStaCtx); * Return: BAND_2G or BAND_5G based on current AP connection * BAND_ALL if not connected */ -enum band_info hdd_conn_get_connected_band(hdd_station_ctx_t *pHddStaCtx); +enum band_info hdd_conn_get_connected_band(struct hdd_station_ctx *pHddStaCtx); /** * hdd_sme_roam_callback() - hdd sme roam callback @@ -346,10 +346,10 @@ QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter, struct qdf_mac_addr *peer_mac_addr, struct sSirBssDescription *bss_desc); -bool hdd_save_peer(hdd_station_ctx_t *sta_ctx, uint8_t sta_id, +bool hdd_save_peer(struct hdd_station_ctx *sta_ctx, uint8_t sta_id, struct qdf_mac_addr *peer_mac_addr); -void hdd_delete_peer(hdd_station_ctx_t *sta_ctx, uint8_t sta_id); -int hdd_get_peer_idx(hdd_station_ctx_t *sta_ctx, struct qdf_mac_addr *addr); +void hdd_delete_peer(struct hdd_station_ctx *sta_ctx, uint8_t sta_id); +int hdd_get_peer_idx(struct hdd_station_ctx *sta_ctx, struct qdf_mac_addr *addr); QDF_STATUS hdd_roam_deregister_sta(hdd_adapter_t *adapter, uint8_t sta_id); #ifdef WLAN_FEATURE_ROAM_OFFLOAD diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 93fc79eca2d9..3a46ea84adf2 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1190,7 +1190,7 @@ struct hdd_adapter { struct sk_buff *skb_to_tx; union { - hdd_station_ctx_t station; + struct hdd_station_ctx station; struct hdd_ap_ctx ap; } sessionCtx; diff --git a/core/hdd/inc/wlan_hdd_tx_rx.h b/core/hdd/inc/wlan_hdd_tx_rx.h index 2dd4ee9e6383..e367152cd1e7 100644 --- a/core/hdd/inc/wlan_hdd_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_tx_rx.h @@ -67,7 +67,7 @@ QDF_STATUS hdd_rx_mul_packet_cbk(void *cds_context, qdf_nbuf_t rx_buf_list, uint8_t staId); #endif /* IPA_OFFLOAD */ -QDF_STATUS hdd_get_peer_sta_id(hdd_station_ctx_t *sta_ctx, +QDF_STATUS hdd_get_peer_sta_id(struct hdd_station_ctx *sta_ctx, struct qdf_mac_addr *peer_mac_addr, uint8_t *sta_id); @@ -126,7 +126,7 @@ static inline void hdd_get_tx_resource(hdd_adapter_t *adapter, } #endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */ -int hdd_get_peer_idx(hdd_station_ctx_t *sta_ctx, struct qdf_mac_addr *addr); +int hdd_get_peer_idx(struct hdd_station_ctx *sta_ctx, struct qdf_mac_addr *addr); const char *hdd_reason_type_to_string(enum netif_reason_type reason); const char *hdd_action_type_to_string(enum netif_action_type action); diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index b61cfac78e98..f0cb0d7f7045 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -163,7 +163,7 @@ static const int beacon_filter_table[] = { static void hdd_conn_set_authenticated(hdd_adapter_t *pAdapter, uint8_t authState) { - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); /* save the new connection state */ @@ -187,7 +187,7 @@ hdd_conn_set_authenticated(hdd_adapter_t *pAdapter, uint8_t authState) void hdd_conn_set_connection_state(hdd_adapter_t *adapter, eConnectionState conn_state) { - hdd_station_ctx_t *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); /* save the new connection state */ @@ -214,7 +214,7 @@ void hdd_conn_set_connection_state(hdd_adapter_t *adapter, * and sets output parameter pConnState; * false otherwise */ -static inline bool hdd_conn_get_connection_state(hdd_station_ctx_t *pHddStaCtx, +static inline bool hdd_conn_get_connection_state(struct hdd_station_ctx *pHddStaCtx, eConnectionState *pConnState) { bool fConnected = false; @@ -241,7 +241,7 @@ static inline bool hdd_conn_get_connection_state(hdd_station_ctx_t *pHddStaCtx, * * Return: true if connecting, false otherwise */ -bool hdd_is_connecting(hdd_station_ctx_t *hdd_sta_ctx) +bool hdd_is_connecting(struct hdd_station_ctx *hdd_sta_ctx) { return hdd_sta_ctx->conn_info.connState == eConnectionState_Connecting; @@ -253,7 +253,7 @@ bool hdd_is_connecting(hdd_station_ctx_t *hdd_sta_ctx) * * Return: false if any errors encountered, true otherwise */ -bool hdd_conn_is_connected(hdd_station_ctx_t *pHddStaCtx) +bool hdd_conn_is_connected(struct hdd_station_ctx *pHddStaCtx) { return hdd_conn_get_connection_state(pHddStaCtx, NULL); } @@ -265,7 +265,7 @@ bool hdd_conn_is_connected(hdd_station_ctx_t *pHddStaCtx) * Return: eCSR_BAND_24 or eCSR_BAND_5G based on current AP connection * eCSR_BAND_ALL if not connected */ -enum band_info hdd_conn_get_connected_band(hdd_station_ctx_t *pHddStaCtx) +enum band_info hdd_conn_get_connected_band(struct hdd_station_ctx *pHddStaCtx) { uint8_t staChannel = 0; @@ -288,7 +288,7 @@ enum band_info hdd_conn_get_connected_band(hdd_station_ctx_t *pHddStaCtx) * Return: false if any errors encountered, true otherwise */ static inline bool -hdd_conn_get_connected_cipher_algo(hdd_station_ctx_t *pHddStaCtx, +hdd_conn_get_connected_cipher_algo(struct hdd_station_ctx *pHddStaCtx, eCsrEncryptionType *pConnectedCipherAlgo) { bool fConnected = false; @@ -356,7 +356,7 @@ static int hdd_add_beacon_filter(hdd_adapter_t *adapter) * * Return: None */ -static void hdd_copy_ht_caps(hdd_station_ctx_t *hdd_sta_ctx, +static void hdd_copy_ht_caps(struct hdd_station_ctx *hdd_sta_ctx, tCsrRoamInfo *roam_info) { tDot11fIEHTCaps *roam_ht_cap = &roam_info->ht_caps; @@ -550,7 +550,7 @@ static void hdd_copy_ht_caps(hdd_station_ctx_t *hdd_sta_ctx, * * Return: None */ -static void hdd_copy_vht_caps(hdd_station_ctx_t *hdd_sta_ctx, +static void hdd_copy_vht_caps(struct hdd_station_ctx *hdd_sta_ctx, tCsrRoamInfo *roam_info) { tDot11fIEVHTCaps *roam_vht_cap = &roam_info->vht_caps; @@ -665,7 +665,7 @@ static void hdd_copy_vht_caps(hdd_station_ctx_t *hdd_sta_ctx, * * Return: None */ -static void hdd_copy_ht_operation(hdd_station_ctx_t *hdd_sta_ctx, +static void hdd_copy_ht_operation(struct hdd_station_ctx *hdd_sta_ctx, tCsrRoamInfo *roam_info) { tDot11fIEHTInfo *roam_ht_ops = &roam_info->ht_operation; @@ -778,7 +778,7 @@ static void hdd_copy_vht_center_freq(struct ieee80211_vht_operation *ieee_ops, * * Return: None */ -static void hdd_copy_vht_operation(hdd_station_ctx_t *hdd_sta_ctx, +static void hdd_copy_vht_operation(struct hdd_station_ctx *hdd_sta_ctx, tCsrRoamInfo *roam_info) { tDot11fIEVHTOperation *roam_vht_ops = &roam_info->vht_operation; @@ -803,7 +803,7 @@ static void hdd_copy_vht_operation(hdd_station_ctx_t *hdd_sta_ctx, static void hdd_save_bss_info(hdd_adapter_t *adapter, tCsrRoamInfo *roam_info) { - hdd_station_ctx_t *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); hdd_sta_ctx->conn_info.freq = cds_chan_to_freq( hdd_sta_ctx->conn_info.operationChannel); @@ -855,7 +855,7 @@ static void hdd_conn_save_connect_info(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, eCsrRoamBssType eBssType) { - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); eCsrEncryptionType encryptType = eCSR_ENCRYPT_TYPE_NONE; QDF_ASSERT(pRoamInfo); @@ -1228,7 +1228,7 @@ static void hdd_send_association_event(struct net_device *dev, int ret; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); union iwreq_data wrqu; int we_event; char *msg; @@ -1463,7 +1463,7 @@ static void hdd_send_association_event(struct net_device *dev, * * Return: none */ -static void hdd_conn_remove_connect_info(hdd_station_ctx_t *pHddStaCtx) +static void hdd_conn_remove_connect_info(struct hdd_station_ctx *pHddStaCtx) { /* Remove staId, bssId and peerMacAddress */ pHddStaCtx->conn_info.staId[0] = HDD_WLAN_INVALID_STA_ID; @@ -1494,7 +1494,7 @@ static void hdd_conn_remove_connect_info(hdd_station_ctx_t *pHddStaCtx) QDF_STATUS hdd_roam_deregister_sta(hdd_adapter_t *adapter, uint8_t staid) { QDF_STATUS qdf_status; - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); int ret = 0; uint8_t *peer_mac = NULL; struct qdf_mac_addr broadcastMacAddr = @@ -1539,7 +1539,7 @@ QDF_STATUS hdd_roam_deregister_sta(hdd_adapter_t *adapter, uint8_t staid) * * Return: None */ -static void hdd_print_bss_info(hdd_station_ctx_t *hdd_sta_ctx) +static void hdd_print_bss_info(struct hdd_station_ctx *hdd_sta_ctx) { uint32_t *cap_info; @@ -1603,7 +1603,7 @@ static QDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, QDF_STATUS vstatus; struct net_device *dev = pAdapter->dev; struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); uint8_t sta_id; bool sendDisconInd = true; @@ -1952,7 +1952,7 @@ QDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, { QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; struct ol_txrx_desc_type staDesc = { 0 }; - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct ol_txrx_ops txrx_ops; void *soc = cds_get_context(QDF_MODULE_ID_SOC); void *pdev = cds_get_context(QDF_MODULE_ID_TXRX); @@ -2250,7 +2250,7 @@ bool hdd_is_roam_sync_in_progress(tCsrRoamInfo *roaminfo) * * Return: sta_id (HDD_WLAN_INVALID_STA_ID if peer not found). */ -static uint8_t hdd_get_ibss_peer_staid(hdd_station_ctx_t *hddstactx, +static uint8_t hdd_get_ibss_peer_staid(struct hdd_station_ctx *hddstactx, tCsrRoamInfo *roaminfo) { uint8_t staid = HDD_WLAN_INVALID_STA_ID; @@ -2287,7 +2287,7 @@ static int hdd_change_sta_state_authenticated(hdd_adapter_t *adapter, QDF_STATUS status; uint32_t timeout; uint8_t staid = HDD_WLAN_INVALID_STA_ID; - hdd_station_ctx_t *hddstactx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *hddstactx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); timeout = hddstactx->hdd_ReassocScenario ? @@ -2357,7 +2357,7 @@ static inline bool hdd_is_key_install_required_for_ibss( static void hdd_change_peer_state_after_set_key(hdd_adapter_t *adapter, tCsrRoamInfo *roaminfo, eCsrRoamResult roam_result) { - hdd_station_ctx_t *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); eCsrEncryptionType encr_type = hdd_sta_ctx->conn_info.ucEncryptionType; /* @@ -2435,7 +2435,7 @@ static QDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, { eCsrEncryptionType connectedCipherAlgo; bool fConnected = false; - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); ENTER(); @@ -2479,7 +2479,7 @@ static QDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter) { QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); tCsrRoamInfo roamInfo; roamInfo.fAuthRequired = false; @@ -2535,7 +2535,7 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, { struct net_device *dev = pAdapter->dev; struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; uint8_t reqRsnIe[DOT11F_IE_RSN_MAX_LEN]; uint32_t reqRsnLength = DOT11F_IE_RSN_MAX_LEN, ie_len; @@ -3239,7 +3239,7 @@ static void hdd_roam_ibss_indication_handler(hdd_adapter_t *pAdapter, { struct hdd_context *pHddCtx = (struct hdd_context *) pAdapter->pHddCtx; - hdd_station_ctx_t *hdd_sta_ctx = + struct hdd_station_ctx *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct qdf_mac_addr broadcastMacAddr = QDF_MAC_ADDR_BROADCAST_INITIALIZER; @@ -3357,7 +3357,7 @@ static void hdd_roam_ibss_indication_handler(hdd_adapter_t *pAdapter, * Return: true if success, false otherwise */ -bool hdd_save_peer(hdd_station_ctx_t *sta_ctx, uint8_t sta_id, +bool hdd_save_peer(struct hdd_station_ctx *sta_ctx, uint8_t sta_id, struct qdf_mac_addr *peer_mac_addr) { int idx; @@ -3383,7 +3383,7 @@ bool hdd_save_peer(hdd_station_ctx_t *sta_ctx, uint8_t sta_id, * * Return: None */ -void hdd_delete_peer(hdd_station_ctx_t *sta_ctx, uint8_t sta_id) +void hdd_delete_peer(struct hdd_station_ctx *sta_ctx, uint8_t sta_id) { int i; @@ -3411,7 +3411,7 @@ static bool roam_remove_ibss_station(hdd_adapter_t *pAdapter, uint8_t staId) uint8_t valid_idx = 0; uint8_t del_idx = 0; uint8_t empty_slots = 0; - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); for (idx = 0; idx < MAX_PEERS; idx++) { if (staId == pHddStaCtx->conn_info.staId[idx]) { @@ -3526,7 +3526,7 @@ hdd_roam_mic_error_indication_handler(hdd_adapter_t *pAdapter, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult) { - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); if (eConnectionState_Associated == pHddStaCtx->conn_info.connState && TKIP_COUNTER_MEASURE_STOPED == @@ -3594,7 +3594,7 @@ roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter, switch (roamResult) { case eCSR_ROAM_RESULT_IBSS_NEW_PEER: { - hdd_station_ctx_t *pHddStaCtx = + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct station_info *stainfo; eCsrEncryptionType encr_type = pHddStaCtx->ibss_enc_key.encType; @@ -3681,7 +3681,7 @@ roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter, } case eCSR_ROAM_RESULT_IBSS_PEER_DEPARTED: { - hdd_station_ctx_t *pHddStaCtx = + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); if (!roam_remove_ibss_station(pAdapter, pRoamInfo->staId)) @@ -4867,13 +4867,13 @@ hdd_indicate_ese_bcn_report_ind(const hdd_adapter_t *pAdapter, * Return: bool */ #ifdef WLAN_FEATURE_11W -static inline bool hdd_is_8021x_sha256_auth_type(hdd_station_ctx_t *pHddStaCtx) +static inline bool hdd_is_8021x_sha256_auth_type(struct hdd_station_ctx *pHddStaCtx) { return eCSR_AUTH_TYPE_RSN_8021X_SHA256 == pHddStaCtx->conn_info.authType; } #else -static inline bool hdd_is_8021x_sha256_auth_type(hdd_station_ctx_t *pHddStaCtx) +static inline bool hdd_is_8021x_sha256_auth_type(struct hdd_station_ctx *pHddStaCtx) { return false; } @@ -4944,7 +4944,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; hdd_adapter_t *pAdapter = (hdd_adapter_t *) pContext; hdd_wext_state_t *pWextState = NULL; - hdd_station_ctx_t *pHddStaCtx = NULL; + struct hdd_station_ctx *pHddStaCtx = NULL; QDF_STATUS status = QDF_STATUS_SUCCESS; struct cfg80211_bss *bss_status; struct hdd_context *hdd_ctx; @@ -5714,7 +5714,7 @@ int hdd_set_csr_auth_type(hdd_adapter_t *pAdapter, eCsrAuthType RSNAuthType) { hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); tCsrRoamProfile *pRoamProfile = &(pWextState->roamProfile); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); pRoamProfile->AuthType.numEntries = 1; hdd_debug("pHddStaCtx->conn_info.authType = %d", @@ -6090,7 +6090,7 @@ static int __iw_get_essid(struct net_device *dev, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *hdd_ctx; hdd_wext_state_t *wextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); int ret; ENTER_DEV(dev); @@ -6161,7 +6161,7 @@ static int __iw_set_auth(struct net_device *dev, struct iw_request_info *info, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *hdd_ctx; hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile; eCsrEncryptionType mcEncryptionType; eCsrEncryptionType ucEncryptionType; @@ -6557,7 +6557,7 @@ static int __iw_set_ap_address(struct net_device *dev, hdd_adapter_t *adapter; struct hdd_context *hdd_ctx; - hdd_station_ctx_t *pHddStaCtx = + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(WLAN_HDD_GET_PRIV_PTR(dev)); uint8_t *pMacAddress = NULL; int ret; @@ -6622,7 +6622,7 @@ static int __iw_get_ap_address(struct net_device *dev, { hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *hdd_ctx; - hdd_station_ctx_t *pHddStaCtx = + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); int ret; diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index ec5248703c5e..d4919041b133 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -3820,7 +3820,7 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(struct hdd_context *hdd_ctx, hdd_adapter_t *adapter; hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; struct hdd_ap_ctx *ap_ctx; - hdd_station_ctx_t *sta_ctx; + struct hdd_station_ctx *sta_ctx; QDF_STATUS qdf_status; qdf_status = hdd_get_front_adapter(hdd_ctx, @@ -4195,7 +4195,7 @@ static int hdd_get_station_assoc_fail(struct hdd_context *hdd_ctx, { struct sk_buff *skb = NULL; uint32_t nl_buf_len; - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; nl_buf_len = NLMSG_HDRLEN; nl_buf_len += sizeof(uint32_t); @@ -4342,7 +4342,7 @@ static int hdd_convert_dot11mode(uint32_t dot11mode) * Return: Success(0) or reason code for failure */ static int32_t hdd_add_tx_bitrate(struct sk_buff *skb, - hdd_station_ctx_t *hdd_sta_ctx, + struct hdd_station_ctx *hdd_sta_ctx, int idx) { struct nlattr *nla_attr; @@ -4386,7 +4386,7 @@ fail: * Return: Success(0) or reason code for failure */ static int32_t hdd_add_sta_info(struct sk_buff *skb, - hdd_station_ctx_t *hdd_sta_ctx, int idx) + struct hdd_station_ctx *hdd_sta_ctx, int idx) { struct nlattr *nla_attr; @@ -4415,7 +4415,7 @@ fail: * Return: Success(0) or reason code for failure */ static int32_t hdd_add_survey_info(struct sk_buff *skb, - hdd_station_ctx_t *hdd_sta_ctx, + struct hdd_station_ctx *hdd_sta_ctx, int idx) { struct nlattr *nla_attr; @@ -4446,7 +4446,7 @@ fail: */ static int32_t hdd_add_link_standard_info(struct sk_buff *skb, - hdd_station_ctx_t *hdd_sta_ctx, int idx) + struct hdd_station_ctx *hdd_sta_ctx, int idx) { struct nlattr *nla_attr; @@ -4480,7 +4480,7 @@ fail: */ static int32_t hdd_add_ap_standard_info(struct sk_buff *skb, - hdd_station_ctx_t *hdd_sta_ctx, int idx) + struct hdd_station_ctx *hdd_sta_ctx, int idx) { struct nlattr *nla_attr; @@ -4520,7 +4520,7 @@ static int hdd_get_station_info(struct hdd_context *hdd_ctx, struct sk_buff *skb = NULL; uint8_t *tmp_hs20 = NULL; uint32_t nl_buf_len; - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); @@ -7445,7 +7445,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, struct hdd_context *hdd_ctx = wiphy_priv(wiphy); struct net_device *dev = wdev->netdev; hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_MAX+1]; uint8_t peer_mac[QDF_MAC_ADDR_SIZE]; uint32_t sta_id; @@ -10747,7 +10747,7 @@ static int __wlan_hdd_cfg80211_set_fast_roaming(struct wiphy *wiphy, int ret; QDF_STATUS qdf_status; unsigned long rc; - hdd_station_ctx_t *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); ENTER_DEV(dev); @@ -10849,7 +10849,7 @@ void hdd_update_cca_info_cb(void *context, uint32_t congestion, struct hdd_context *hdd_ctx = (struct hdd_context *)context; int status; hdd_adapter_t *adapter = NULL; - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; status = wlan_hdd_validate_context(hdd_ctx); if (status != 0) @@ -12675,7 +12675,7 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t *pAdapter, uint8_t key_index, const uint8_t *mac_addr, const uint8_t *key, int key_Len) { - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); tCsrRoamSetKey setKey; bool isConnected = true; int status = 0; @@ -13290,7 +13290,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *pHddCtx; - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; struct qdf_mac_addr STAMacAddress; #if defined(FEATURE_WLAN_TDLS) && !defined(CONVERGED_TDLS_ENABLE) tCsrStaParams StaParams = { 0 }; @@ -13784,7 +13784,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, (pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) { hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - hdd_station_ctx_t *pHddStaCtx = + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); if (!pairwise) { @@ -14076,7 +14076,7 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy, { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(ndev); hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_context *pHddCtx; int status; @@ -14789,7 +14789,7 @@ QDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter, void hdd_select_cbmode(hdd_adapter_t *pAdapter, uint8_t operationChannel, struct ch_params *ch_params) { - hdd_station_ctx_t *station_ctx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *station_ctx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_mon_set_ch_info *ch_info = &station_ctx->ch_info; uint8_t sec_ch = 0; struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); @@ -15024,7 +15024,7 @@ static int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, QDF_STATUS qdf_status; hdd_wext_state_t *pWextState; struct hdd_context *pHddCtx; - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; uint32_t roamId; tCsrRoamProfile *pRoamProfile; eCsrAuthType RSNAuthType; @@ -15061,7 +15061,7 @@ static int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, sizeof(hdd_sta_ctx->conn_info.conn_flag)); if (pRoamProfile) { - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); @@ -15374,7 +15374,7 @@ static int wlan_hdd_cfg80211_set_auth_type(hdd_adapter_t *pAdapter, enum nl80211_auth_type auth_type) { hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); /*set authentication type */ switch (auth_type) { @@ -15561,7 +15561,7 @@ static int wlan_hdd_cfg80211_set_cipher(hdd_adapter_t *pAdapter, { eCsrEncryptionType encryptionType = eCSR_ENCRYPT_TYPE_NONE; hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); if (!cipher) { hdd_debug("received cipher %d - considering none", cipher); @@ -16248,7 +16248,7 @@ static int wlan_hdd_cfg80211_set_privacy(hdd_adapter_t *pAdapter, int wlan_hdd_try_disconnect(hdd_adapter_t *pAdapter) { unsigned long rc; - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; int status, result = 0; tHalHandle hal; @@ -16636,7 +16636,7 @@ static int wlan_hdd_disconnect(hdd_adapter_t *pAdapter, u16 reason) { int status, result = 0; unsigned long rc; - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); eConnectionState prev_conn_state; tHalHandle hal = WLAN_HDD_GET_HAL_CTX(pAdapter); @@ -16813,7 +16813,7 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy, { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); int status; - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); #ifdef FEATURE_WLAN_TDLS uint8_t staIdx; @@ -16963,7 +16963,7 @@ static int wlan_hdd_cfg80211_set_privacy_ibss(hdd_adapter_t *pAdapter, int status = 0; hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); eCsrEncryptionType encryptionType = eCSR_ENCRYPT_TYPE_NONE; - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); ENTER(); @@ -17056,7 +17056,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); tCsrRoamProfile *pRoamProfile; int status; - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); struct qdf_mac_addr bssid; u8 channelNum = 0; @@ -18270,7 +18270,7 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy, { struct hdd_context *hdd_ctx = wiphy_priv(wiphy); hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); int status; ENTER(); @@ -19098,7 +19098,7 @@ static int __wlan_hdd_cfg80211_set_mon_ch(struct wiphy *wiphy, { struct hdd_context *hdd_ctx = wiphy_priv(wiphy); hdd_adapter_t *adapter; - hdd_station_ctx_t *sta_ctx; + struct hdd_station_ctx *sta_ctx; struct hdd_mon_set_ch_info *ch_info; QDF_STATUS status; tHalHandle hal_hdl; diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 47929eff437d..aed9f61551df 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -2579,7 +2579,7 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_channel, hdd_adapter_t *pHostapdAdapter = (netdev_priv(dev)); struct hdd_context *pHddCtx = NULL; hdd_adapter_t *sta_adapter; - hdd_station_ctx_t *sta_ctx; + struct hdd_station_ctx *sta_ctx; pHddCtx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(pHddCtx); @@ -2701,7 +2701,7 @@ QDF_STATUS wlan_hdd_get_channel_for_sap_restart( struct hdd_ap_ctx *hdd_ap_ctx; uint8_t intf_ch = 0; struct hdd_context *hdd_ctx; - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; hdd_adapter_t *sta_adapter; hdd_adapter_t *ap_adapter = wlan_hdd_get_adapter_from_vdev( psoc, vdev_id); @@ -6932,7 +6932,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy, hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile; - hdd_station_ctx_t *pHddStaCtx = + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); if (eConnectionState_IbssConnected == diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index f79fe9763778..6b62cb5ff333 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -184,7 +184,7 @@ static int hdd_get_tsm_stats(hdd_adapter_t *adapter, tAniTrafStrmMetrics *tsm_metrics) { struct hdd_context *hdd_ctx; - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; QDF_STATUS status; int ret; void *cookie; @@ -395,7 +395,7 @@ hdd_get_ibss_peer_info_cb(void *pUserData, tSirPeerInfoRspParams *pPeerInfo) { hdd_adapter_t *adapter = (hdd_adapter_t *) pUserData; - hdd_station_ctx_t *pStaCtx; + struct hdd_station_ctx *pStaCtx; uint8_t i; if ((NULL == adapter) || @@ -823,7 +823,7 @@ void hdd_wma_send_fastreassoc_cmd(hdd_adapter_t *adapter, int hdd_reassoc(hdd_adapter_t *adapter, const uint8_t *bssid, uint8_t channel, const handoff_src src) { - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int ret = 0; @@ -1022,7 +1022,7 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid, uint8_t *frame; struct ieee80211_hdr_3addr *hdr; u64 cookie; - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; struct hdd_context *hdd_ctx; tpSirMacVendorSpecificFrameHdr pVendorSpecific = (tpSirMacVendorSpecificFrameHdr) payload; @@ -2368,7 +2368,7 @@ static void hdd_get_link_status_cb(uint8_t status, void *context) static int wlan_hdd_get_link_status(hdd_adapter_t *adapter) { - hdd_station_ctx_t *pHddStaCtx = + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); QDF_STATUS hstatus; int ret; @@ -4353,7 +4353,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, uint32_t roamId = 0; tCsrRoamModifyProfileFields modProfileFields; tCsrHandoffRequest handoffInfo; - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; if (QDF_STA_MODE != adapter->device_mode) { hdd_warn("Unsupported in mode %s(%d)", @@ -4963,7 +4963,7 @@ static int drv_cmd_get_ibss_peer_info_all(hdd_adapter_t *adapter, { int ret = 0; int status = QDF_STATUS_SUCCESS; - hdd_station_ctx_t *pHddStaCtx = NULL; + struct hdd_station_ctx *pHddStaCtx = NULL; char *extra = NULL; int idx = 0; int length = 0; @@ -5091,7 +5091,7 @@ static int drv_cmd_get_ibss_peer_info(hdd_adapter_t *adapter, int ret = 0; uint8_t *value = command; QDF_STATUS status; - hdd_station_ctx_t *pHddStaCtx = NULL; + struct hdd_station_ctx *pHddStaCtx = NULL; char extra[128] = { 0 }; uint32_t length = 0; uint8_t staIdx = 0; @@ -5322,7 +5322,7 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, char extra[128] = { 0 }; int len = 0; uint8_t tid = 0; - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; tAniTrafStrmMetrics tsm_metrics = {0}; if ((QDF_STA_MODE != adapter->device_mode) && diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 042b1b06068f..aafba3bc7e8d 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -1320,7 +1320,7 @@ void hdd_ipa_set_tx_flow_info(void) hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; QDF_STATUS status; hdd_adapter_t *adapter; - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; struct hdd_ap_ctx *hdd_ap_ctx; hdd_hostapd_state_t *hostapd_state; struct qdf_mac_addr staBssid = QDF_MAC_ADDR_ZERO_INITIALIZER; @@ -3040,7 +3040,7 @@ static int hdd_ipa_uc_disconnect_ap(hdd_adapter_t *adapter) */ static int hdd_ipa_uc_disconnect_sta(hdd_adapter_t *adapter) { - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; struct hdd_ipa_priv *hdd_ipa = ghdd_ipa; int ret = 0; diff --git a/core/hdd/src/wlan_hdd_lpass.c b/core/hdd/src/wlan_hdd_lpass.c index 9cf8f5c80284..eecdfbd610ab 100644 --- a/core/hdd/src/wlan_hdd_lpass.c +++ b/core/hdd/src/wlan_hdd_lpass.c @@ -90,7 +90,7 @@ static void wlan_hdd_get_channel_info(struct hdd_context *hdd_ctx, */ static int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data, hdd_adapter_t *adapter, - hdd_station_ctx_t *sta_ctx, + struct hdd_station_ctx *sta_ctx, uint8_t is_on, uint8_t is_connected) { struct hdd_context *hdd_ctx = NULL; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 6291f07feec9..a1b4bc531a4b 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -2989,7 +2989,7 @@ static hdd_adapter_t *hdd_alloc_station_adapter(struct hdd_context *hdd_ctx, { struct net_device *pWlanDev = NULL; hdd_adapter_t *adapter = NULL; - hdd_station_ctx_t *sta_ctx; + struct hdd_station_ctx *sta_ctx; /* * cfg80211 initialization and registration.... */ @@ -3342,7 +3342,7 @@ hdd_vdev_destroy: QDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) { - hdd_station_ctx_t *pHddStaCtx = &adapter->sessionCtx.station; + struct hdd_station_ctx *pHddStaCtx = &adapter->sessionCtx.station; struct hdd_context *hdd_ctx; QDF_STATUS status; int ret_val; @@ -4173,7 +4173,7 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter) case QDF_STA_MODE: case QDF_P2P_CLIENT_MODE: { - hdd_station_ctx_t *pHddStaCtx = + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pHostapdAdapter); bssid = &pHddStaCtx->conn_info.bssId; break; @@ -4459,7 +4459,7 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx) hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; QDF_STATUS status; hdd_adapter_t *adapter; - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; struct qdf_mac_addr peerMacAddr; ENTER(); @@ -9598,7 +9598,7 @@ static void hdd_state_info_dump(char **buf_ptr, uint16_t *size) struct hdd_context *hdd_ctx; hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; QDF_STATUS status; - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; hdd_adapter_t *adapter; uint16_t len = 0; char *buf = *buf_ptr; @@ -12146,7 +12146,7 @@ bool hdd_is_connection_in_progress(uint8_t *session_id, enum scan_reject_states *reason) { hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; - hdd_station_ctx_t *hdd_sta_ctx = NULL; + struct hdd_station_ctx *hdd_sta_ctx = NULL; hdd_adapter_t *adapter = NULL; QDF_STATUS status = 0; uint8_t sta_id = 0; diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c index 64145c59b16f..bd0622cc6ee8 100644 --- a/core/hdd/src/wlan_hdd_nan_datapath.c +++ b/core/hdd/src/wlan_hdd_nan_datapath.c @@ -167,7 +167,7 @@ static int hdd_close_ndi(hdd_adapter_t *adapter) static bool hdd_is_ndp_allowed(struct hdd_context *hdd_ctx) { hdd_adapter_t *adapter; - hdd_station_ctx_t *sta_ctx; + struct hdd_station_ctx *sta_ctx; QDF_STATUS status; hdd_adapter_list_node_t *curr = NULL, *next = NULL; @@ -435,7 +435,7 @@ static int hdd_ndi_delete_req_handler(struct hdd_context *hdd_ctx, uint16_t transaction_id; struct nan_datapath_ctx *ndp_ctx; int ret; - hdd_station_ctx_t *sta_ctx; + struct hdd_station_ctx *sta_ctx; ENTER(); @@ -878,7 +878,7 @@ static void hdd_ndp_iface_create_rsp_handler(hdd_adapter_t *adapter, uint8_t create_transaction_id = 0; uint32_t create_status = NDP_RSP_STATUS_ERROR; uint32_t create_reason = NDP_NAN_DATA_IFACE_CREATE_FAILED; - hdd_station_ctx_t *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + 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; tSirBssDescription tmp_bss_descp = {0}; @@ -1243,7 +1243,7 @@ static void hdd_ndp_new_peer_ind_handler(hdd_adapter_t *adapter, tSirBssDescription tmp_bss_descp = {0}; tCsrRoamInfo *roam_info; struct nan_datapath_ctx *ndp_ctx = WLAN_HDD_GET_NDP_CTX_PTR(adapter); - hdd_station_ctx_t *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); ENTER(); @@ -1302,7 +1302,7 @@ static void hdd_ndp_peer_departed_ind_handler(hdd_adapter_t *adapter, struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); struct sme_ndp_peer_ind *peer_ind = ind_params; struct nan_datapath_ctx *ndp_ctx = WLAN_HDD_GET_NDP_CTX_PTR(adapter); - hdd_station_ctx_t *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); hdd_roam_deregister_sta(adapter, peer_ind->sta_id); hdd_delete_peer(sta_ctx, peer_ind->sta_id); @@ -1344,7 +1344,7 @@ static void hdd_ndp_confirm_ind_handler(hdd_adapter_t *adapter, struct sk_buff *vendor_event; struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); struct nan_datapath_ctx *ndp_ctx = WLAN_HDD_GET_NDP_CTX_PTR(adapter); - hdd_station_ctx_t *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); uint32_t data_len; ENTER(); @@ -1748,7 +1748,7 @@ static void hdd_ndp_end_ind_handler(hdd_adapter_t *adapter, struct ndp_end_indication_event *end_ind = ind_params; uint32_t data_len, i; struct nan_datapath_ctx *ndp_ctx = WLAN_HDD_GET_NDP_CTX_PTR(adapter); - hdd_station_ctx_t *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); uint32_t *ndp_instance_array; hdd_adapter_t *ndi_adapter; @@ -2242,7 +2242,7 @@ int hdd_ndi_delete(uint8_t vdev_id, char *iface_name, uint16_t transaction_id) { int ret; hdd_adapter_t *adapter; - hdd_station_ctx_t *sta_ctx; + struct hdd_station_ctx *sta_ctx; struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); /* check if adapter by vdev_id is valid NDI */ @@ -2284,7 +2284,7 @@ void hdd_ndi_drv_ndi_create_rsp_handler(uint8_t vdev_id, struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); hdd_adapter_t *adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id); struct qdf_mac_addr bc_mac_addr = QDF_MAC_ADDR_BROADCAST_INITIALIZER; - hdd_station_ctx_t *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); if (ndi_rsp->status == QDF_STATUS_SUCCESS) { hdd_alert("NDI interface successfully created"); @@ -2335,7 +2335,7 @@ int hdd_ndp_get_peer_idx(uint8_t vdev_id, struct qdf_mac_addr *addr) { struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); hdd_adapter_t *adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id); - hdd_station_ctx_t *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); return hdd_get_peer_idx(sta_ctx, addr); } @@ -2353,7 +2353,7 @@ int hdd_ndp_new_peer_handler(uint8_t vdev_id, uint16_t sta_id, hdd_adapter_t *adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id); tSirBssDescription tmp_bss_descp = {0}; tCsrRoamInfo roam_info = {0}; - hdd_station_ctx_t *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); ENTER(); /* save peer in ndp ctx */ @@ -2391,7 +2391,7 @@ void hdd_ndp_peer_departed_handler(uint8_t vdev_id, uint16_t sta_id, { struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); hdd_adapter_t *adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id); - hdd_station_ctx_t *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); ENTER(); hdd_roam_deregister_sta(adapter, sta_id); diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index 832b60f950c6..cc86b6d111f7 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -233,7 +233,7 @@ static int hdd_ocb_register_sta(hdd_adapter_t *adapter) QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; struct ol_txrx_desc_type sta_desc = {0}; struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); uint8_t peer_id; struct ol_txrx_ops txrx_ops; void *soc = cds_get_context(QDF_MODULE_ID_SOC); diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 6c9fb83ac6a6..f6a775b2e892 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -662,7 +662,7 @@ static int hdd_set_grat_arp_keepalive(hdd_adapter_t *adapter) QDF_STATUS status; int exit_code; struct hdd_context *hdd_ctx; - hdd_station_ctx_t *sta_ctx; + struct hdd_station_ctx *sta_ctx; tSirKeepAliveReq req = { .packetType = SIR_KEEP_ALIVE_UNSOLICIT_ARP_RSP, .dest_macaddr = QDF_MAC_ADDR_BROADCAST_INITIALIZER, @@ -1043,7 +1043,7 @@ hdd_update_conn_state_mask(hdd_adapter_t *adapter, uint32_t *conn_state_mask) { eConnectionState connState; - hdd_station_ctx_t *sta_ctx; + struct hdd_station_ctx *sta_ctx; sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); @@ -2157,7 +2157,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy, struct net_device *ndev = wdev->netdev; hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(ndev); int status; - hdd_station_ctx_t *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); ENTER(); diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 423e6cbd4a3b..a67bbd982735 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -482,7 +482,7 @@ bool hdd_get_interface_info(hdd_adapter_t *pAdapter, tpSirWifiInterfaceInfo pInfo) { uint8_t *staMac = NULL; - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -1337,7 +1337,7 @@ int wlan_hdd_ll_stats_get(hdd_adapter_t *adapter, uint32_t req_id, { int ret; tSirLLStatsGetReq get_req; - hdd_station_ctx_t *hddstactx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *hddstactx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); ENTER(); @@ -1397,7 +1397,7 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy, tSirLLStatsGetReq LinkLayerStatsGetReq; struct net_device *dev = wdev->netdev; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); - hdd_station_ctx_t *hddstactx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *hddstactx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); /* ENTER() intentionally not used in a frequently invoked API */ @@ -3886,7 +3886,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, struct station_info *sinfo) { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); int ssidlen = pHddStaCtx->conn_info.SSID.SSID.length; uint8_t rate_flags; uint8_t mcs_index; @@ -4600,7 +4600,7 @@ static int __wlan_hdd_cfg80211_dump_survey(struct wiphy *wiphy, { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *pHddCtx; - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; int status; bool filled = false; diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index 3816bf5c6ce0..6dbed56d4131 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -92,7 +92,7 @@ static void wlan_hdd_tdls_determine_channel_opclass(struct hdd_context *hddctx, hdd_adapter_t *adapter, hddTdlsPeer_t *curr_peer, uint32_t *channel, uint32_t *opclass) { - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; /* * If tdls offchannel is not enabled then we provide base channel @@ -2484,7 +2484,7 @@ int wlan_hdd_tdls_get_all_peers(hdd_adapter_t *pAdapter, char *buf, int buflen) hddTdlsPeer_t *curr_peer; tdlsCtx_t *pHddTdlsCtx; struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; ENTER(); @@ -3080,7 +3080,7 @@ void wlan_hdd_tdls_timer_restart(hdd_adapter_t *pAdapter, qdf_mc_timer_t *timer, uint32_t expirationTime) { - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; if (NULL == pAdapter || WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) { hdd_err("invalid pAdapter: %p", pAdapter); @@ -4131,7 +4131,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *pHddCtx = wiphy_priv(wiphy); - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; tdlsCtx_t *hdd_tdls_ctx; u8 peerMac[QDF_MAC_ADDR_SIZE]; QDF_STATUS status; @@ -5472,7 +5472,7 @@ int hdd_set_tdls_secoffchanneloffset(struct hdd_context *hdd_ctx, int offchanoff int hdd_set_tdls_offchannelmode(hdd_adapter_t *adapter, int offchanmode) { hddTdlsPeer_t *conn_peer = NULL; - hdd_station_ctx_t *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); sme_tdls_chan_switch_params chan_switch_params; QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -5663,7 +5663,7 @@ void wlan_hdd_tdls_update_rx_pkt_cnt(hdd_adapter_t *adapter, struct sk_buff *skb) { struct hdd_context *hdd_ctx; - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; uint8_t mac_cnt; uint8_t valid_mac_entries; struct qdf_mac_addr *mac_addr; @@ -5730,7 +5730,7 @@ void wlan_hdd_tdls_update_tx_pkt_cnt(hdd_adapter_t *adapter, struct sk_buff *skb) { struct hdd_context *hdd_ctx; - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; uint8_t mac_cnt; uint8_t valid_mac_entries; struct qdf_mac_addr *mac_addr; @@ -6356,7 +6356,7 @@ int wlan_hdd_tdls_antenna_switch(struct hdd_context *hdd_ctx, { uint8_t tdls_peer_cnt; uint32_t vdev_nss; - hdd_station_ctx_t *sta_ctx; + struct hdd_station_ctx *sta_ctx; if (hdd_ctx->connected_peer_count == 0) return 0; diff --git a/core/hdd/src/wlan_hdd_tsf.c b/core/hdd/src/wlan_hdd_tsf.c index 35d9e0eb0e12..b08a43aa4fed 100644 --- a/core/hdd/src/wlan_hdd_tsf.c +++ b/core/hdd/src/wlan_hdd_tsf.c @@ -72,7 +72,7 @@ static enum hdd_tsf_get_state hdd_tsf_check_conn_state(hdd_adapter_t *adapter) { enum hdd_tsf_get_state ret = TSF_RETURN; - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; if (adapter->device_mode == QDF_STA_MODE || adapter->device_mode == QDF_P2P_CLIENT_MODE) { @@ -612,7 +612,7 @@ static inline uint64_t hdd_get_monotonic_host_time(void) static ssize_t __hdd_wlan_tsf_show(struct device *dev, struct device_attribute *attr, char *buf) { - hdd_station_ctx_t *hdd_sta_ctx; + struct hdd_station_ctx *hdd_sta_ctx; hdd_adapter_t *adapter; ssize_t size; uint64_t host_time, target_time; diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 85a4f0aaff96..3e72e61d23b3 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -182,7 +182,7 @@ static inline struct sk_buff *hdd_skb_orphan(hdd_adapter_t *pAdapter, void hdd_tx_resume_cb(void *adapter_context, bool tx_resume) { hdd_adapter_t *pAdapter = (hdd_adapter_t *) adapter_context; - hdd_station_ctx_t *hdd_sta_ctx = NULL; + struct hdd_station_ctx *hdd_sta_ctx = NULL; if (!pAdapter) { /* INVALID ARG */ @@ -440,7 +440,7 @@ static void hdd_get_transmit_sta_id(hdd_adapter_t *adapter, { bool mcbc_addr = false; QDF_STATUS status; - hdd_station_ctx_t *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); struct qdf_mac_addr *dst_addr = NULL; dst_addr = (struct qdf_mac_addr *)skb->data; @@ -531,7 +531,7 @@ static int __hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); bool granted; uint8_t STAId; - hdd_station_ctx_t *pHddStaCtx = &pAdapter->sessionCtx.station; + struct hdd_station_ctx *pHddStaCtx = &pAdapter->sessionCtx.station; struct qdf_mac_addr *mac_addr; #ifdef QCA_PKT_PROTO_TRACE uint8_t proto_type = 0; @@ -811,7 +811,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) * Return: QDF_STATUS_SUCCESS/QDF_STATUS_E_FAILURE */ -QDF_STATUS hdd_get_peer_sta_id(hdd_station_ctx_t *pHddStaCtx, +QDF_STATUS hdd_get_peer_sta_id(struct hdd_station_ctx *pHddStaCtx, struct qdf_mac_addr *pMacAddress, uint8_t *staId) { uint8_t idx; @@ -1033,7 +1033,7 @@ static QDF_STATUS hdd_mon_rx_packet_cbk(void *context, qdf_nbuf_t rxbuf) * * Return: index when success else INVALID_PEER_IDX */ -int hdd_get_peer_idx(hdd_station_ctx_t *sta_ctx, struct qdf_mac_addr *addr) +int hdd_get_peer_idx(struct hdd_station_ctx *sta_ctx, struct qdf_mac_addr *addr) { uint8_t idx; @@ -1147,7 +1147,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf) int rxstat; struct sk_buff *skb = NULL; struct sk_buff *next = NULL; - hdd_station_ctx_t *pHddStaCtx = NULL; + struct hdd_station_ctx *pHddStaCtx = NULL; unsigned int cpu_index; struct qdf_mac_addr *mac_addr; bool wake_lock = false; diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index f322b40fc93b..5b61f35abcf6 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -3307,7 +3307,7 @@ hdd_wlan_get_ibss_mac_addr_from_staid(hdd_adapter_t *pAdapter, uint8_t staIdx) { uint8_t idx; - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); for (idx = 0; idx < MAX_PEERS; idx++) { if (HDD_WLAN_INVALID_STA_ID != @@ -3332,7 +3332,7 @@ static QDF_STATUS hdd_wlan_get_ibss_peer_info(hdd_adapter_t *pAdapter, { QDF_STATUS status = QDF_STATUS_E_FAILURE; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); - hdd_station_ctx_t *pStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); tSirPeerInfoRspParams *pPeerInfo = &pStaCtx->ibss_peer_info; INIT_COMPLETION(pAdapter->ibss_peer_info_comp); @@ -3381,7 +3381,7 @@ static QDF_STATUS hdd_wlan_get_ibss_peer_info_all(hdd_adapter_t *pAdapter) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); - hdd_station_ctx_t *pStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); tSirPeerInfoRspParams *pPeerInfo = &pStaCtx->ibss_peer_info; int i; @@ -3550,7 +3550,7 @@ static void hdd_get_rssi_cb(int8_t rssi, uint32_t sta_id, void *context) QDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) { struct hdd_context *pHddCtx; - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; QDF_STATUS hstatus; int ret; void *cookie; @@ -3686,7 +3686,7 @@ static void hdd_get_snr_cb(int8_t snr, uint32_t sta_id, void *context) QDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) { struct hdd_context *pHddCtx; - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; QDF_STATUS hstatus; int valid; int ret; @@ -3853,7 +3853,7 @@ return_cached_value: int wlan_hdd_get_link_speed(hdd_adapter_t *sta_adapter, uint32_t *link_speed) { struct hdd_context *hddctx = WLAN_HDD_GET_CTX(sta_adapter); - hdd_station_ctx_t *hdd_stactx = + struct hdd_station_ctx *hdd_stactx = WLAN_HDD_GET_STATION_CTX_PTR(sta_adapter); int ret; @@ -4890,7 +4890,7 @@ static int __iw_set_freq(struct net_device *dev, struct iw_request_info *info, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *hdd_ctx; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); tCsrRoamProfile *pRoamProfile; ENTER_DEV(dev); @@ -5012,7 +5012,7 @@ static int __iw_get_freq(struct net_device *dev, struct iw_request_info *info, tHalHandle hHal; hdd_wext_state_t *pWextState; tCsrRoamProfile *pRoamProfile; - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_context *hdd_ctx; int ret; @@ -5098,7 +5098,7 @@ static int __iw_get_tx_power(struct net_device *dev, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); int ret; ENTER_DEV(dev); @@ -5221,7 +5221,7 @@ static int __iw_get_bitrate(struct net_device *dev, QDF_STATUS status; hdd_wext_state_t *pWextState; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_context *hdd_ctx; int ret; @@ -5311,7 +5311,7 @@ static int __iw_set_bitrate(struct net_device *dev, { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_wext_state_t *pWextState; - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); uint8_t supp_rates[WNI_CFG_SUPPORTED_RATES_11A_LEN]; uint32_t a_len = WNI_CFG_SUPPORTED_RATES_11A_LEN; uint32_t b_len = WNI_CFG_SUPPORTED_RATES_11B_LEN; @@ -5611,7 +5611,7 @@ static int __iw_get_genie(struct net_device *dev, { hdd_wext_state_t *pWextState; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); QDF_STATUS status; uint32_t length = DOT11F_IE_RSN_MAX_LEN; uint8_t genIeBytes[DOT11F_IE_RSN_MAX_LEN]; @@ -5751,7 +5751,7 @@ static int __iw_get_encode(struct net_device *dev, dwrq->flags |= IW_ENCODE_NOKEY; authType = - ((hdd_station_ctx_t *) WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))-> + ((struct hdd_station_ctx *) WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))-> conn_info.authType; if (eCSR_AUTH_TYPE_OPEN_SYSTEM == authType) @@ -6381,7 +6381,7 @@ static void hdd_get_class_a_statistics_cb(void *stats, void *context) */ QDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter) { - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); QDF_STATUS hstatus; int ret; void *cookie; @@ -6499,7 +6499,7 @@ static void hdd_get_station_statistics_cb(void *stats, void *context) */ QDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter) { - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); QDF_STATUS status; int errno; void *cookie; @@ -6770,7 +6770,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_context *hdd_ctx; struct iw_point *encoderq = &(wrqu->encoding); @@ -7058,7 +7058,7 @@ static int __iw_set_encodeext(struct net_device *dev, union iwreq_data *wrqu, char *extra) { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); struct hdd_context *hdd_ctx; QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; @@ -7439,7 +7439,7 @@ static int __iw_set_mlme(struct net_device *dev, union iwreq_data *wrqu, char *extra) { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct iw_mlme *mlme = (struct iw_mlme *)extra; QDF_STATUS status = QDF_STATUS_SUCCESS; struct hdd_context *hdd_ctx; @@ -7954,7 +7954,7 @@ static int __iw_setint_getnone(struct net_device *dev, { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_context *hdd_ctx; tSmeConfigParams *sme_config; int *value = (int *)extra; @@ -10183,7 +10183,7 @@ static int __iw_get_char_setnone(struct net_device *dev, tHalHandle hHal = NULL; tpAniSirGlobal pMac = NULL; - hdd_station_ctx_t *pHddStaCtx = NULL; + struct hdd_station_ctx *pHddStaCtx = NULL; struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); hdd_adapter_t *useAdapter = NULL; @@ -10475,7 +10475,7 @@ static int __iw_get_char_setnone(struct net_device *dev, #endif case WE_GET_IBSS_STA_INFO: { - hdd_station_ctx_t *pHddStaCtx = + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); int idx = 0; int length = 0, buf = 0; @@ -10631,7 +10631,7 @@ static int __iw_get_char_setnone(struct net_device *dev, int8_t s7snr = 0; int status = 0; struct hdd_context *pHddCtx; - hdd_station_ctx_t *pHddStaCtx; + struct hdd_station_ctx *pHddStaCtx; pHddCtx = WLAN_HDD_GET_CTX(pAdapter); status = wlan_hdd_validate_context(pHddCtx); @@ -11355,7 +11355,7 @@ static int __iw_add_tspec(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); hdd_wlan_wmm_status_e *pStatus = (hdd_wlan_wmm_status_e *) extra; int params[HDD_WLAN_WMM_PARAM_COUNT]; struct sme_qos_wmmtspecinfo tSpec; @@ -11663,7 +11663,7 @@ static int __iw_set_fties(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct hdd_context *hdd_ctx; int ret; @@ -12903,7 +12903,7 @@ static int wlan_hdd_set_mon_chan(hdd_adapter_t *adapter, uint32_t chan, uint32_t bandwidth) { struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - hdd_station_ctx_t *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); struct hdd_mon_set_ch_info *ch_info = &sta_ctx->ch_info; QDF_STATUS status; tHalHandle hal_hdl = hdd_ctx->hHal; @@ -14417,7 +14417,7 @@ const struct iw_handler_def we_handler_def = { static int hdd_set_wext(hdd_adapter_t *pAdapter) { hdd_wext_state_t *pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct hdd_station_ctx *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); ENTER();