From cf124491c7cdb0880ae6a7e322219bd7cdeb1bfe Mon Sep 17 00:00:00 2001 From: Kabilan Kannan Date: Sun, 13 May 2018 20:12:37 -0700 Subject: [PATCH] qcacmn: Remove unused data structures in TDLS component Remove the unused data structures in TDLS component to avoid incorrect usage Change-Id: Id3997d5895dba8e3cb3f60fe102ca846cb009607 CRs-Fixed: 2232726 --- umac/tdls/core/src/wlan_tdls_main.h | 4 ---- umac/tdls/dispatcher/inc/wlan_tdls_public_structs.h | 8 -------- umac/tdls/dispatcher/src/wlan_tdls_ucfg_api.c | 6 ------ 3 files changed, 18 deletions(-) diff --git a/umac/tdls/core/src/wlan_tdls_main.h b/umac/tdls/core/src/wlan_tdls_main.h index 6867ffd4f1e9..b2a0a8613786 100644 --- a/umac/tdls/core/src/wlan_tdls_main.h +++ b/umac/tdls/core/src/wlan_tdls_main.h @@ -165,9 +165,7 @@ struct tdls_set_state_info { * @tdls_nss_teardown_complete: tdls tear down complete * @tdls_nss_transition_mode: tdls nss transition mode * @tdls_teardown_peers_cnt: tdls tear down peer count - * @tdls_tx_cnf_cb: callback registered by hdd to receive the ack cnf * @set_state_info: set tdls state info - * @tx_ack_cnf_cb_data: user data to tdls_tx_cnf_cb * @tdls_event_cb: tdls event callback * @tdls_evt_cb_data: tdls event user data * @tdls_peer_context: userdata for register/deregister TDLS peer @@ -209,8 +207,6 @@ struct tdls_soc_priv_obj { void *tdls_rx_cb_data; tdls_wmm_check tdls_wmm_cb; void *tdls_wmm_cb_data; - tdls_tx_ack_cnf_callback tdls_tx_cnf_cb; - void *tx_ack_cnf_cb_data; tdls_evt_callback tdls_event_cb; void *tdls_evt_cb_data; void *tdls_peer_context; diff --git a/umac/tdls/dispatcher/inc/wlan_tdls_public_structs.h b/umac/tdls/dispatcher/inc/wlan_tdls_public_structs.h index 089a75f9e151..8f1e045fb9af 100644 --- a/umac/tdls/dispatcher/inc/wlan_tdls_public_structs.h +++ b/umac/tdls/dispatcher/inc/wlan_tdls_public_structs.h @@ -543,10 +543,6 @@ typedef void (*tdls_evt_callback) (void *data, enum tdls_event_type ev_type, struct tdls_osif_indication *event); -/* prototype of callback registered by hdd to receive the ack cnf */ -typedef int (*tdls_tx_ack_cnf_callback)(void *user_data, - struct tdls_tx_cnf *tx_ack_cnf_cb_data); - /* This callback is used to register TDLS peer with the datapath */ typedef QDF_STATUS (*tdls_register_peer_callback)(void *userdata, uint32_t vdev_id, @@ -577,8 +573,6 @@ typedef QDF_STATUS * @tdls_update_dp_vdev_flags: pass CDP_UPDATE_TDLS_FLAGS * @tdls_event_cb: tdls event callback * @tdls_evt_cb_data: tdls event data - * @ack_cnf_cb: tdls tx ack callback to indicate the tx status - * @tx_ack_cnf_cb_data: tdls tx ack user data * @tdls_peer_context: userdata for register/deregister TDLS peer * @tdls_reg_peer: register tdls peer with datapath * @tdls_dereg_peer: deregister tdls peer from datapath @@ -598,8 +592,6 @@ struct tdls_start_params { void *tdls_wmm_cb_data; tdls_evt_callback tdls_event_cb; void *tdls_evt_cb_data; - tdls_tx_ack_cnf_callback ack_cnf_cb; - void *tx_ack_cnf_cb_data; void *tdls_peer_context; tdls_register_peer_callback tdls_reg_peer; tdls_deregister_peer_callback tdls_dereg_peer; diff --git a/umac/tdls/dispatcher/src/wlan_tdls_ucfg_api.c b/umac/tdls/dispatcher/src/wlan_tdls_ucfg_api.c index 9134509eacc0..d071dc0cd622 100644 --- a/umac/tdls/dispatcher/src/wlan_tdls_ucfg_api.c +++ b/umac/tdls/dispatcher/src/wlan_tdls_ucfg_api.c @@ -204,9 +204,6 @@ QDF_STATUS ucfg_tdls_update_config(struct wlan_objmgr_psoc *psoc, soc_obj->tdls_event_cb = req->tdls_event_cb; soc_obj->tdls_evt_cb_data = req->tdls_evt_cb_data; - soc_obj->tdls_tx_cnf_cb = req->ack_cnf_cb; - soc_obj->tx_ack_cnf_cb_data = req->tx_ack_cnf_cb_data; - /* Save callbacks to register/deregister TDLS sta with datapath */ soc_obj->tdls_reg_peer = req->tdls_reg_peer; soc_obj->tdls_dereg_peer = req->tdls_dereg_peer; @@ -307,9 +304,6 @@ QDF_STATUS ucfg_tdls_psoc_disable(struct wlan_objmgr_psoc *psoc) soc_obj->tdls_event_cb = NULL; soc_obj->tdls_evt_cb_data = NULL; - soc_obj->tdls_tx_cnf_cb = NULL; - soc_obj->tx_ack_cnf_cb_data = NULL; - return status; }