qcacmn: cdp: Converge cdp_peer_ops

Currently cdp ops are given pdev/vdev/peer
handle as its arguments, which is directly
accessed in those APIs. This can cause a
race-condition in access of the respective
handles if it has been deleted in parallel.

Hence as a part of cdp convergence, pass only
the pdev_id or vdev_id or peer mac address,
which will be used to get the respective handles,
and hence avoiding the unwanted access of the
handles if it has been deleted.

Also remove the ops which are used to store
and retrieve such handles, that no more needed.

- register_peer
- clear_peer
- change_peer_state
- peer_get_ref_by_addr
- peer_release_ref
- peer_state_update
- get_vdev_by_sta_id
- register_ocb_peer
- get_peer_state
- get_vdev_for_peer
- update_ibss_add_peer_num_of_vdev
- remove_peers_for_vdev
- remove_peers_for_vdev_no_lock
- copy_mac_addr_raw
- add_last_real_peer
- is_vdev_restore_last_peer
- update_last_real_peer
- peer_detach_force_delete

Change-Id: I4a41211464a30e018e8b73b8e9b91c7a509327b4
CRs-Fixed: 2541711

dp/inc/cdp_txrx_peer_ops.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -29,7 +29,7 @@
 /**
  * cdp_peer_register() - Register peer into physical device
  * @soc - data path soc handle
- * @pdev - data path device instance
+ * @pdev_id - data path device instance id
  * @sta_desc - peer description
  *
  * Register peer into physical device
@@ -38,8 +38,8 @@
  *         QDF_STATUS_E_NOSUPPORT not support this feature
  */
 static inline QDF_STATUS
-cdp_peer_register(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
-		struct ol_txrx_desc_type *sta_desc)
+cdp_peer_register(ol_txrx_soc_handle soc, uint8_t pdev_id,
+		  struct ol_txrx_desc_type *sta_desc)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
@@ -48,7 +48,8 @@ cdp_peer_register(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
 	}
 
 	if (soc->ops->peer_ops->register_peer)
-		return soc->ops->peer_ops->register_peer(pdev, sta_desc);
+		return soc->ops->peer_ops->register_peer(soc, pdev_id,
+							 sta_desc);
 
 	return QDF_STATUS_E_NOSUPPORT;
 }
@@ -56,7 +57,7 @@ cdp_peer_register(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
 /**
  * cdp_clear_peer() - remove peer from physical device
  * @soc - data path soc handle
- * @pdev - data path device instance
+ * @pdev_id - data path device instance id
  * @peer_addr - peer mac address
  *
  * remove peer from physical device
@@ -65,7 +66,7 @@ cdp_peer_register(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
  *         QDF_STATUS_E_NOSUPPORT not support this feature
  */
 static inline QDF_STATUS
-cdp_clear_peer(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
+cdp_clear_peer(ol_txrx_soc_handle soc, uint8_t pdev_id,
 	       struct qdf_mac_addr peer_addr)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
@@ -75,7 +76,7 @@ cdp_clear_peer(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
 	}
 
 	if (soc->ops->peer_ops->clear_peer)
-		return soc->ops->peer_ops->clear_peer(pdev, peer_addr);
+		return soc->ops->peer_ops->clear_peer(soc, pdev_id, peer_addr);
 
 	return QDF_STATUS_E_NOSUPPORT;
 }
@@ -108,176 +109,88 @@ cdp_peer_register_ocb_peer(ol_txrx_soc_handle soc,
 }
 
 /**
- * cdp_peer_remove_for_vdev() - remove peer instance from virtual interface
+ * cdp_find_peer_exist - Find if peer already exists
  * @soc - data path soc handle
- * @vdev - virtual interface instance
- * @callback - remove done notification callback function pointer
- * @callback_context - callback caller context
- * @remove_last_peer - removed peer is last peer or not
+ * @pdev_id - data path device instance id
+ * @peer_addr - peer mac address
  *
- * remove peer instance from virtual interface
- *
- * Return: NONE
+ * Return: true or false
  */
-static inline void
-cdp_peer_remove_for_vdev(ol_txrx_soc_handle soc,
-		struct cdp_vdev *vdev, ol_txrx_vdev_peer_remove_cb callback,
-		void *callback_context, bool remove_last_peer)
+static inline bool
+cdp_find_peer_exist(ol_txrx_soc_handle soc, uint8_t pdev_id,
+		    uint8_t *peer_addr)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
 			"%s invalid instance", __func__);
-		return;
+		return false;
 	}
 
-	if (soc->ops->peer_ops->remove_peers_for_vdev)
-		return soc->ops->peer_ops->remove_peers_for_vdev(
-			vdev, callback, callback_context, remove_last_peer);
+	if (soc->ops->peer_ops->find_peer_exist)
+		return soc->ops->peer_ops->find_peer_exist(soc, pdev_id,
+							   peer_addr);
 
-	return;
+	return false;
 }
 
 /**
- * cdp_peer_remove_for_vdev_no_lock() - remove peer instance from vdev
+ * cdp_find_peer_exist_on_vdev - Find if duplicate peer exists
+ * on the given vdev
  * @soc - data path soc handle
- * @vdev - virtual interface instance
- * @callback - remove done notification callback function pointer
- * @callback_context - callback caller context
- *
- * remove peer instance from virtual interface without lock
- *
- * Return: NONE
- */
-static inline void
-cdp_peer_remove_for_vdev_no_lock(ol_txrx_soc_handle soc,
-				 struct cdp_vdev *vdev,
-				 ol_txrx_vdev_peer_remove_cb callback,
-				 void *callback_context)
-{
-	if (!soc || !soc->ops || !soc->ops->peer_ops) {
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
-			  "%s invalid instance", __func__);
-		return;
-	}
-
-	if (soc->ops->peer_ops->remove_peers_for_vdev_no_lock)
-		return soc->ops->peer_ops->remove_peers_for_vdev_no_lock(
-			vdev, callback, callback_context);
-}
-
-/**
- * cdp_peer_get_ref_by_addr() - Find peer by peer mac address and inc peer ref
- * @soc - data path soc handle
- * @pdev - data path device instance
- * @peer_addr - peer mac address
- * @debug_id - debug_id to track caller
- *
- * To release the peer ref, cdp_peer_release_ref needs to be called.
- *
- * Return: peer instance void pointer
- *         NULL cannot find target peer
- */
-static inline void
-*cdp_peer_get_ref_by_addr(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
-			  uint8_t *peer_addr,
-			  enum peer_debug_id_type debug_id)
-{
-	if (!soc || !soc->ops || !soc->ops->peer_ops) {
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
-			  "%s invalid instance", __func__);
-		return NULL;
-	}
-
-	if (soc->ops->peer_ops->peer_get_ref_by_addr)
-		return soc->ops->peer_ops->peer_get_ref_by_addr(
-			pdev, peer_addr, debug_id);
-
-	return NULL;
-}
-
-/**
- * cdp_peer_release_ref() - Release peer reference
- * @soc - data path soc handle
- * @peer - peer pointer
- * @debug_id - debug_id to track caller
- *
- * Return:void
- */
-static inline void
-cdp_peer_release_ref(ol_txrx_soc_handle soc, void *peer,
-		     enum peer_debug_id_type debug_id)
-{
-	if (!soc || !soc->ops || !soc->ops->peer_ops) {
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
-			  "%s invalid instance", __func__);
-		return;
-	}
-
-	if (soc->ops->peer_ops->peer_release_ref)
-		soc->ops->peer_ops->peer_release_ref(peer, debug_id);
-}
-
-/**
- * cdp_peer_find_by_addr() - Find peer by peer mac address
- * @soc - data path soc handle
- * @pdev - data path device instance
+ * @vdev_id - data path virtual interface id
  * @peer_addr - peer mac address
  *
- * Find peer and local peer id by peer mac address
- *
- * Return: peer instance void pointer
- *         NULL cannot find target peer
+ * Return: true or false
  */
-static inline void
-*cdp_peer_find_by_addr(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
-		uint8_t *peer_addr)
+static inline bool
+cdp_find_peer_exist_on_vdev(ol_txrx_soc_handle soc, uint8_t vdev_id,
+			    uint8_t *peer_addr)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
 			"%s invalid instance", __func__);
-		return NULL;
+		return false;
 	}
 
-	if (soc->ops->peer_ops->find_peer_by_addr)
-		return soc->ops->peer_ops->find_peer_by_addr(
-			pdev, peer_addr);
+	if (soc->ops->peer_ops->find_peer_exist_on_vdev)
+		return soc->ops->peer_ops->find_peer_exist_on_vdev(soc, vdev_id,
+								   peer_addr);
 
-	return NULL;
+	return false;
 }
 
 /**
- * cdp_peer_find_by_addr_and_vdev() - Find peer by peer mac address within vdev
+ * cdp_find_peer_exist_on_other_vdev - Find if duplicate peer exists
+ * on other than the given vdev
  * @soc - data path soc handle
- * @pdev - data path device instance
- * @vdev - virtual interface instance
+ * @vdev_id - data path virtual interface id
  * @peer_addr - peer mac address
+ * @max_bssid - max number of bssids
  *
- * Find peer by peer mac address within vdev
- *
- * Return: peer instance void pointer
- *         NULL cannot find target peer
+ * Return: true or false
  */
-static inline void
-*cdp_peer_find_by_addr_and_vdev(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
-		struct cdp_vdev *vdev, uint8_t *peer_addr)
+static inline bool
+cdp_find_peer_exist_on_other_vdev(ol_txrx_soc_handle soc, uint8_t vdev_id,
+				  uint8_t *peer_addr, uint16_t max_bssid)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
 			"%s invalid instance", __func__);
-		return NULL;
+		return false;
 	}
 
-	if (soc->ops->peer_ops->find_peer_by_addr_and_vdev)
-		return soc->ops->peer_ops->find_peer_by_addr_and_vdev(
-			pdev, vdev, peer_addr);
+	if (soc->ops->peer_ops->find_peer_exist_on_other_vdev)
+		return soc->ops->peer_ops->find_peer_exist_on_other_vdev(
+								soc, vdev_id,
+								peer_addr,
+								max_bssid);
 
-	return NULL;
+	return false;
 }
 
 /**
  * cdp_peer_state_update() - update peer local state
  * @soc - data path soc handle
- * @pdev - data path device instance
  * @peer_addr - peer mac address
  * @state - new peer local state
  *
@@ -287,8 +200,8 @@ static inline void
  *         QDF_STATUS_E_NOSUPPORT not support this feature
  */
 static inline QDF_STATUS
-cdp_peer_state_update(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
-		uint8_t *peer_addr, enum ol_txrx_peer_state state)
+cdp_peer_state_update(ol_txrx_soc_handle soc, uint8_t *peer_addr,
+		      enum ol_txrx_peer_state state)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
@@ -297,8 +210,8 @@ cdp_peer_state_update(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
 	}
 
 	if (soc->ops->peer_ops->peer_state_update)
-		return soc->ops->peer_ops->peer_state_update(
-			pdev, peer_addr, state);
+		return soc->ops->peer_ops->peer_state_update(soc, peer_addr,
+							     state);
 
 	return QDF_STATUS_E_NOSUPPORT;
 }
@@ -306,14 +219,15 @@ cdp_peer_state_update(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
 /**
  * cdp_peer_state_get() - Get local peer state
  * @soc - data path soc handle
- * @peer - peer instance
+ * @vdev_id - virtual interface id
+ * @peer_mac - peer mac addr
  *
  * Get local peer state
  *
  * Return: peer status
  */
 static inline int
-cdp_peer_state_get(ol_txrx_soc_handle soc, void *peer)
+cdp_peer_state_get(ol_txrx_soc_handle soc, uint8_t vdev_id, uint8_t *peer_mac)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
@@ -322,7 +236,8 @@ cdp_peer_state_get(ol_txrx_soc_handle soc, void *peer)
 	}
 
 	if (soc->ops->peer_ops->get_peer_state)
-		return soc->ops->peer_ops->get_peer_state(peer);
+		return soc->ops->peer_ops->get_peer_state(soc, vdev_id,
+							  peer_mac);
 
 	return 0;
 }
@@ -330,7 +245,7 @@ cdp_peer_state_get(ol_txrx_soc_handle soc, void *peer)
 /**
  * cdp_peer_get_vdevid() - Get virtual interface id which peer registered
  * @soc - data path soc handle
- * @peer - peer instance
+ * @peer_mac - peer mac address
  * @vdev_id - virtual interface id which peer registered
  *
  * Get virtual interface id which peer registered
@@ -339,7 +254,8 @@ cdp_peer_state_get(ol_txrx_soc_handle soc, void *peer)
  *         QDF_STATUS_E_NOSUPPORT not support this feature
  */
 static inline QDF_STATUS
-cdp_peer_get_vdevid(ol_txrx_soc_handle soc, void *peer, uint8_t *vdev_id)
+cdp_peer_get_vdevid(ol_txrx_soc_handle soc,
+		    uint8_t  *peer_mac, uint8_t *vdev_id)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
@@ -348,7 +264,7 @@ cdp_peer_get_vdevid(ol_txrx_soc_handle soc, void *peer, uint8_t *vdev_id)
 	}
 
 	if (soc->ops->peer_ops->get_vdevid)
-		return soc->ops->peer_ops->get_vdevid(peer, vdev_id);
+		return soc->ops->peer_ops->get_vdevid(soc, peer_mac, vdev_id);
 
 	return QDF_STATUS_E_NOSUPPORT;
 }
@@ -406,35 +322,10 @@ static inline uint8_t
 	return NULL;
 }
 
-/**
- * cdp_peer_get_vdev() - Get virtual interface instance which peer belongs
- * @soc - data path soc handle
- * @peer - peer instance
- *
- * Get virtual interface instance which peer belongs
- *
- * Return: virtual interface instance pointer
- *         NULL in case cannot find
- */
-static inline struct cdp_vdev
-*cdp_peer_get_vdev(ol_txrx_soc_handle soc, void *peer)
-{
-	if (!soc || !soc->ops || !soc->ops->peer_ops) {
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
-			"%s invalid instance", __func__);
-		return NULL;
-	}
-
-	if (soc->ops->peer_ops->get_vdev_for_peer)
-		return soc->ops->peer_ops->get_vdev_for_peer(peer);
-
-	return NULL;
-}
-
 /**
  * cdp_peer_update_ibss_add_peer_num_of_vdev() - update number of peer
  * @soc - data path soc handle
- * @vdev - virtual interface instance
+ * @vdev_id - virtual interface instance id
  * @peer_num_delta - number of peer should be updated
  *
  * update number of peer
@@ -444,7 +335,8 @@ static inline struct cdp_vdev
  */
 static inline int16_t
 cdp_peer_update_ibss_add_peer_num_of_vdev(ol_txrx_soc_handle soc,
-		struct cdp_vdev *vdev, int16_t peer_num_delta)
+					  uint8_t vdev_id,
+					  int16_t peer_num_delta)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
@@ -454,7 +346,8 @@ cdp_peer_update_ibss_add_peer_num_of_vdev(ol_txrx_soc_handle soc,
 
 	if (soc->ops->peer_ops->update_ibss_add_peer_num_of_vdev)
 		return soc->ops->peer_ops->update_ibss_add_peer_num_of_vdev(
-			vdev, peer_num_delta);
+								soc, vdev_id,
+								peer_num_delta);
 
 	return 0;
 }
@@ -462,7 +355,7 @@ cdp_peer_update_ibss_add_peer_num_of_vdev(ol_txrx_soc_handle soc,
 /**
  * cdp_peer_copy_mac_addr_raw() - copy peer mac address
  * @soc - data path soc handle
- * @vdev - virtual interface instance
+ * @vdev_id - virtual interface instance id
  * @bss_addr - mac address should be copied
  *
  * copy peer mac address
@@ -471,7 +364,7 @@ cdp_peer_update_ibss_add_peer_num_of_vdev(ol_txrx_soc_handle soc,
  */
 static inline void
 cdp_peer_copy_mac_addr_raw(ol_txrx_soc_handle soc,
-		struct cdp_vdev *vdev, uint8_t *bss_addr)
+			   uint8_t vdev_id, uint8_t *bss_addr)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
@@ -480,7 +373,8 @@ cdp_peer_copy_mac_addr_raw(ol_txrx_soc_handle soc,
 	}
 
 	if (soc->ops->peer_ops->copy_mac_addr_raw)
-		return soc->ops->peer_ops->copy_mac_addr_raw(vdev, bss_addr);
+		return soc->ops->peer_ops->copy_mac_addr_raw(soc, vdev_id,
+							     bss_addr);
 
 	return;
 }
@@ -488,16 +382,16 @@ cdp_peer_copy_mac_addr_raw(ol_txrx_soc_handle soc,
 /**
  * cdp_peer_add_last_real_peer() - Add peer with last peer marking
  * @soc - data path soc handle
- * @pdev - data path device instance
- * @vdev - virtual interface instance
+ * @pdev_id - data path device instance id
+ * @vdev_id - virtual interface instance id
  *
  * copy peer mac address
  *
  * Return: none
  */
 static inline void
-cdp_peer_add_last_real_peer(ol_txrx_soc_handle soc,
-		struct cdp_pdev *pdev, struct cdp_vdev *vdev)
+cdp_peer_add_last_real_peer(ol_txrx_soc_handle soc, uint8_t pdev_id,
+			    uint8_t vdev_id)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
@@ -506,15 +400,16 @@ cdp_peer_add_last_real_peer(ol_txrx_soc_handle soc,
 	}
 
 	if (soc->ops->peer_ops->add_last_real_peer)
-		return soc->ops->peer_ops->add_last_real_peer(
-			pdev, vdev);
+		return soc->ops->peer_ops->add_last_real_peer(soc, pdev_id,
+							      vdev_id);
 	return;
 }
 
 /**
  * cdp_peer_is_vdev_restore_last_peer() - restore last peer
  * @soc - data path soc handle
- * @peer - peer instance pointer
+ * @vdev_id - virtual interface id
+ * @peer_mac - peer mac address
  *
  * restore last peer
  *
@@ -522,7 +417,8 @@ cdp_peer_add_last_real_peer(ol_txrx_soc_handle soc,
  *         fasle, restore fail
  */
 static inline bool
-cdp_peer_is_vdev_restore_last_peer(ol_txrx_soc_handle soc, void *peer)
+cdp_peer_is_vdev_restore_last_peer(ol_txrx_soc_handle soc, uint8_t vdev_id,
+				   uint8_t *peer_mac)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
@@ -531,7 +427,9 @@ cdp_peer_is_vdev_restore_last_peer(ol_txrx_soc_handle soc, void *peer)
 	}
 
 	if (soc->ops->peer_ops->is_vdev_restore_last_peer)
-		return soc->ops->peer_ops->is_vdev_restore_last_peer(peer);
+		return soc->ops->peer_ops->is_vdev_restore_last_peer(soc,
+								     vdev_id,
+								     peer_mac);
 
 	return false;
 }
@@ -539,8 +437,8 @@ cdp_peer_is_vdev_restore_last_peer(ol_txrx_soc_handle soc, void *peer)
 /**
  * cdp_peer_update_last_real_peer() - update last real peer
  * @soc - data path soc handle
- * @pdev - data path device instance
- * @peer - peer instance pointer
+ * @pdev_id - data path device instance id
+ * @vdev_id - virtual interface id
  * @restore_last_peer - restore last peer or not
  *
  * update last real peer
@@ -548,8 +446,8 @@ cdp_peer_is_vdev_restore_last_peer(ol_txrx_soc_handle soc, void *peer)
  * Return: none
  */
 static inline void
-cdp_peer_update_last_real_peer(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
-		void *vdev, bool restore_last_peer)
+cdp_peer_update_last_real_peer(ol_txrx_soc_handle soc, uint8_t pdev_id,
+			       uint8_t vdev_id, bool restore_last_peer)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
@@ -558,8 +456,9 @@ cdp_peer_update_last_real_peer(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
 	}
 
 	if (soc->ops->peer_ops->update_last_real_peer)
-		return soc->ops->peer_ops->update_last_real_peer(pdev, vdev,
-			restore_last_peer);
+		return soc->ops->peer_ops->update_last_real_peer(
+						soc, pdev_id, vdev_id,
+						restore_last_peer);
 
 	return;
 }
@@ -576,7 +475,8 @@ cdp_peer_update_last_real_peer(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
  * Return: None
  */
 static inline void cdp_peer_detach_force_delete(ol_txrx_soc_handle soc,
-		void *peer)
+						uint8_t vdev_id,
+						uint8_t *peer_mac)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
@@ -585,7 +485,9 @@ static inline void cdp_peer_detach_force_delete(ol_txrx_soc_handle soc,
 	}
 
 	if (soc->ops->peer_ops->peer_detach_force_delete)
-		return soc->ops->peer_ops->peer_detach_force_delete(peer);
+		return soc->ops->peer_ops->peer_detach_force_delete(soc,
+								    vdev_id,
+								    peer_mac);
 
 	return;
 }
@@ -620,13 +522,15 @@ is_cdp_peer_detach_force_delete_supported(ol_txrx_soc_handle soc)
 /*
  * cdp_peer_set_peer_as_tdls() - To set peer as tdls peer
  * @soc: pointer to SOC handle
- * @peer: dp peer
+ * @vdev_id: virtual interface id
+ * @peer_mac: peer mac address
  * @var: true or false
  *
  * Return: void
  */
 static inline void
-cdp_peer_set_peer_as_tdls(ol_txrx_soc_handle soc, void *peer, bool val)
+cdp_peer_set_peer_as_tdls(ol_txrx_soc_handle soc, uint8_t vdev_id,
+			  uint8_t *peer_mac, bool val)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
@@ -635,21 +539,24 @@ cdp_peer_set_peer_as_tdls(ol_txrx_soc_handle soc, void *peer, bool val)
 	}
 
 	if (soc->ops->peer_ops->set_peer_as_tdls_peer)
-		soc->ops->peer_ops->set_peer_as_tdls_peer(peer, val);
+		soc->ops->peer_ops->set_peer_as_tdls_peer(soc, vdev_id,
+							  peer_mac, val);
 }
 
 /**
  * cdp_peer_set_tdls_offchan_enabled() - Set tdls offchan operation as enabled
- * @soc - data path soc handle
- * @peer - peer instance pointer
- * @val - true or false
+ * @soc: pointer to SOC handle
+ * @vdev_id: virtual interface id
+ * @peer_mac: peer mac address
+ * @val: true or false
  *
  * update tdls_offchan_enabled
  *
  * Return: none
  */
 static inline void
-cdp_peer_set_tdls_offchan_enabled(ol_txrx_soc_handle soc, void *peer, bool val)
+cdp_peer_set_tdls_offchan_enabled(ol_txrx_soc_handle soc, uint8_t vdev_id,
+				  uint8_t *peer_mac, bool val)
 {
 	if (!soc || !soc->ops || !soc->ops->peer_ops) {
 		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_FATAL,
@@ -658,7 +565,8 @@ cdp_peer_set_tdls_offchan_enabled(ol_txrx_soc_handle soc, void *peer, bool val)
 	}
 
 	if (soc->ops->peer_ops->set_tdls_offchan_enabled)
-		soc->ops->peer_ops->set_tdls_offchan_enabled(peer, val);
+		soc->ops->peer_ops->set_tdls_offchan_enabled(soc, vdev_id,
+							     peer_mac, val);
 }
 
 #endif /* _CDP_TXRX_PEER_H_ */