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

umac/tdls/core/src/wlan_tdls_cmds_process.c

@@ -1501,7 +1501,6 @@ QDF_STATUS tdls_process_del_peer_rsp(struct tdls_del_sta_rsp *rsp)
 
 			id = wlan_vdev_get_id(vdev);
 
-#ifdef USE_NEW_TDLS_PEER_CALLBACKS
 			if (TDLS_IS_LINK_CONNECTED(curr_peer)) {
 				soc_obj->tdls_dereg_peer(
 					soc_obj->tdls_peer_context,
@@ -1513,19 +1512,6 @@ QDF_STATUS tdls_process_del_peer_rsp(struct tdls_del_sta_rsp *rsp)
 					soc_obj->tdls_peer_context,
 					id, curr_peer->sta_id);
 			}
-#else
-			if (TDLS_IS_LINK_CONNECTED(curr_peer)) {
-				soc_obj->tdls_dereg_tl_peer(
-					soc_obj->tdls_tl_peer_data,
-					id, curr_peer->sta_id);
-				tdls_decrement_peer_count(soc_obj);
-			} else if (TDLS_LINK_CONNECTING ==
-				   curr_peer->link_status) {
-				soc_obj->tdls_dereg_tl_peer(
-					soc_obj->tdls_tl_peer_data,
-					id, curr_peer->sta_id);
-			}
-#endif
 		}
 		tdls_reset_peer(vdev_obj, macaddr);
 		conn_rec[sta_idx].sta_id = 0;
@@ -1697,15 +1683,9 @@ QDF_STATUS tdls_process_enable_link(struct tdls_oper_request *req)
 					  TDLS_LINK_SUCCESS);
 
 	id = wlan_vdev_get_id(vdev);
-#ifdef USE_NEW_TDLS_PEER_CALLBACKS
 	status = soc_obj->tdls_reg_peer(soc_obj->tdls_peer_context,
 					id, mac, peer->sta_id,
 					peer->qos);
-#else
-	status = soc_obj->tdls_reg_tl_peer(soc_obj->tdls_tl_peer_data,
-					   id, mac, peer->sta_id,
-					   peer->signature, peer->qos);
-#endif
 	if (QDF_IS_STATUS_ERROR(status)) {
 		tdls_err("TDLS register peer fail, status %d", status);
 		goto error;

umac/tdls/core/src/wlan_tdls_ct.c

@@ -1274,19 +1274,11 @@ void tdls_disable_offchan_and_teardown_links(
 		 */
 		tdls_reset_peer(tdls_vdev, curr_peer->peer_mac.bytes);
 
-#ifdef USE_NEW_TDLS_PEER_CALLBACKS
 		if (tdls_soc->tdls_dereg_peer)
 			tdls_soc->tdls_dereg_peer(
 					tdls_soc->tdls_peer_context,
 					wlan_vdev_get_id(vdev),
 					curr_peer->sta_id);
-#else
-		if (tdls_soc->tdls_dereg_tl_peer)
-			tdls_soc->tdls_dereg_tl_peer(
-					tdls_soc->tdls_tl_peer_data,
-					wlan_vdev_get_id(vdev),
-					curr_peer->sta_id);
-#endif
 		tdls_decrement_peer_count(tdls_soc);
 		tdls_soc->tdls_conn_info[staidx].sta_id = 0;
 		tdls_soc->tdls_conn_info[staidx].session_id = 255;

umac/tdls/core/src/wlan_tdls_main.h

@@ -170,15 +170,9 @@ struct tdls_set_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
-#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: callback to register the TDLS peer with TL
- * @tdls_dereg_tl_peer: callback to unregister the TDLS peer
-#endif
  * @tx_q_ack: queue for tx frames waiting for ack
  * @tdls_con_cap: tdls concurrency support
  * @tdls_send_mgmt_req: store eWNI_SME_TDLS_SEND_MGMT_REQ value
@@ -219,15 +213,9 @@ struct tdls_soc_priv_obj {
 	void *tx_ack_cnf_cb_data;
 	tdls_evt_callback tdls_event_cb;
 	void *tdls_evt_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;
 	qdf_list_t tx_q_ack;
 	enum tdls_conc_cap tdls_con_cap;

umac/tdls/dispatcher/inc/wlan_tdls_public_structs.h

@@ -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;
 };
 

umac/tdls/dispatcher/src/wlan_tdls_ucfg_api.c

@@ -207,17 +207,10 @@ QDF_STATUS ucfg_tdls_update_config(struct wlan_objmgr_psoc *psoc,
 	soc_obj->tdls_tx_cnf_cb = req->ack_cnf_cb;
 	soc_obj->tx_ack_cnf_cb_data = req->tx_ack_cnf_cb_data;
 
-#ifdef USE_NEW_TDLS_PEER_CALLBACKS
-	/* Save callbacks to register/deregister TDLS sta with TL */
+	/* 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;
 	soc_obj->tdls_peer_context = req->tdls_peer_context;
-#else
-	/* Save callbacks to register/deregister TDLS sta with TL */
-	soc_obj->tdls_reg_tl_peer = req->tdls_reg_tl_peer;
-	soc_obj->tdls_dereg_tl_peer = req->tdls_dereg_tl_peer;
-	soc_obj->tdls_tl_peer_data = req->tdls_tl_peer_data;
-#endif
 
 	/* Save legacy PE/WMA commands in TDLS soc object */
 	soc_obj->tdls_send_mgmt_req = req->tdls_send_mgmt_req;