qcacmn: Remove obsolete TDLS peer callback interface

Change "qcacmn: Introduce new versions of TDLS peer callbacks"
(Change-Id Id4ea23266b0f3e1480b645c5afce6c17585ccb46) introduced a new
interface which removed an unused parameter and changed obsolete
naming.

Subsequently change "qcacld-3.0: Use new TDLS peer callback interface"
(Change-Id: I5c4684ac0a62f314da26f92ece2c9a9874d63634 in project
qcacld-3.0) updated the only registrant to use the new interface. Now
that the old interface is no longer being used, remove it.

Change-Id: I32bb1f633b1dd1514aa6e4c3fdea044b3bca0009
CRs-Fixed: 2200971
This commit is contained in:
Jeff Johnson
2018-03-02 08:48:24 -08:00
committed by nshrivas
parent 31dade3142
commit 1f5b24e8b5
5 changed files with 1 additions and 79 deletions

View File

@@ -547,8 +547,6 @@ typedef void (*tdls_evt_callback) (void *data,
typedef int (*tdls_tx_ack_cnf_callback)(void *user_data,
struct tdls_tx_cnf *tx_ack_cnf_cb_data);
#ifdef USE_NEW_TDLS_PEER_CALLBACKS
/* This callback is used to register TDLS peer with the datapath */
typedef QDF_STATUS (*tdls_register_peer_callback)(void *userdata,
uint32_t vdev_id,
@@ -561,23 +559,6 @@ typedef QDF_STATUS (*tdls_deregister_peer_callback)(void *userdata,
uint32_t vdev_id,
uint8_t sta_id);
#else
/* This callback is used to register TDLS peer with TL */
typedef QDF_STATUS (*tdls_register_tl_peer_callback)(void *userdata,
uint32_t vdev_id,
const uint8_t *mac,
uint16_t stat_id,
uint8_t ucastsig,
uint8_t qos);
/* This callback is used to deregister TDLS peer */
typedef QDF_STATUS (*tdls_deregister_tl_peer_callback)(void *userdata,
uint32_t vdev_id,
uint8_t sta_id);
#endif
/* This callback is used to update datapath vdev flags */
typedef QDF_STATUS
(*tdls_dp_vdev_update_flags_callback)(void *cbk_data,
@@ -598,15 +579,9 @@ typedef QDF_STATUS
* @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
#ifdef USE_NEW_TDLS_PEER_CALLBACKS
* @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
#else
* @tdls_tl_peer_data: userdata for register/deregister TDLS peer
* @tdls_reg_tl_peer: tdls register tdls peer
* @tdls_dereg_tl_peer: tdls deregister tdls peer
#endif
* @tdls_dp_vdev_update: update vdev flags in datapath
*/
struct tdls_start_params {
@@ -625,15 +600,9 @@ struct tdls_start_params {
void *tdls_evt_cb_data;
tdls_tx_ack_cnf_callback ack_cnf_cb;
void *tx_ack_cnf_cb_data;
#ifdef USE_NEW_TDLS_PEER_CALLBACKS
void *tdls_peer_context;
tdls_register_peer_callback tdls_reg_peer;
tdls_deregister_peer_callback tdls_dereg_peer;
#else
void *tdls_tl_peer_data;
tdls_register_tl_peer_callback tdls_reg_tl_peer;
tdls_deregister_tl_peer_callback tdls_dereg_tl_peer;
#endif
tdls_dp_vdev_update_flags_callback tdls_dp_vdev_update;
};