From 7e36889461cce9176f3a68368bd522d3c3a7ff74 Mon Sep 17 00:00:00 2001
From: Kris Muthusamy <kmuthusa@codeaurora.org>
Date: Thu, 9 Nov 2017 22:51:09 -0800
Subject: [PATCH] qcacmn: Adding vdev id for WDS add/del/update API's

    - Update the WDS add/del/update dp api's with vdev context

Change-Id: I68bf5670232aaa4bb4cce6a6fe0f7b3b2e921143
CRs-fixed: 2133484
---
 dp/inc/cdp_txrx_ops.h | 6 +++---
 dp/wifi3.0/dp_main.c  | 4 ++--
 dp/wifi3.0/dp_rx.h    | 4 ++--
 dp/wifi3.0/dp_tx.c    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dp/inc/cdp_txrx_ops.h b/dp/inc/cdp_txrx_ops.h
index 3d6b9d4f6fff..43a78be75858 100644
--- a/dp/inc/cdp_txrx_ops.h
+++ b/dp/inc/cdp_txrx_ops.h
@@ -632,13 +632,13 @@ struct ol_if_ops {
 	int (*peer_unref_delete)(void *scn_handle, uint8_t vdev_id,
 			uint8_t *peer_macaddr);
 	bool (*is_hw_dbs_2x2_capable)(struct wlan_objmgr_psoc *psoc);
-	int (*peer_add_wds_entry)(void *ol_soc_handle,
+	int (*peer_add_wds_entry)(void *ol_osif_vdev_handle,
 			const uint8_t *dest_macaddr, uint8_t *peer_macaddr,
 			uint32_t flags);
-	int (*peer_update_wds_entry)(void *ol_soc_handle,
+	int (*peer_update_wds_entry)(void *ol_osif_vdev_handle,
 			uint8_t *dest_macaddr, uint8_t *peer_macaddr,
 			uint32_t flags);
-	void (*peer_del_wds_entry)(void *ol_soc_handle,
+	void (*peer_del_wds_entry)(void *ol_osif_vdev_handle,
 			uint8_t *wds_macaddr);
 	QDF_STATUS (*lro_hash_config)(void *scn_handle,
 			struct cdp_lro_hash_config *lro_hash);
diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c
index e08bef73ab02..8063ddb7e2bc 100644
--- a/dp/wifi3.0/dp_main.c
+++ b/dp/wifi3.0/dp_main.c
@@ -1451,7 +1451,7 @@ static void dp_wds_aging_timer_fn(void *soc_hdl)
 					DP_STATS_INC(soc, ast.aged_out, 1);
 
 					soc->cdp_soc.ol_ops->peer_del_wds_entry(
-							pdev->osif_pdev,
+							vdev->osif_vdev,
 							ase->mac_addr.raw);
 
 					dp_peer_del_ast(soc, ase);
@@ -5579,7 +5579,7 @@ static inline void dp_peer_delete_ast_entries(struct dp_soc *soc,
 	DP_PEER_ITERATE_ASE_LIST(peer, ast_entry, temp_ast_entry) {
 		if (ast_entry->next_hop) {
 			soc->cdp_soc.ol_ops->peer_del_wds_entry(
-					peer->vdev->pdev->osif_pdev,
+					peer->vdev->osif_vdev,
 					ast_entry->mac_addr.raw);
 		}
 
diff --git a/dp/wifi3.0/dp_rx.h b/dp/wifi3.0/dp_rx.h
index 04daa4efd38b..f2a93f39bedc 100644
--- a/dp/wifi3.0/dp_rx.h
+++ b/dp/wifi3.0/dp_rx.h
@@ -368,7 +368,7 @@ dp_rx_wds_srcport_learn(struct dp_soc *soc,
 		if (!dp_peer_add_ast(soc, ta_peer, wds_src_mac,
 							dp_ast_type_wds)) {
 			ret = soc->cdp_soc.ol_ops->peer_add_wds_entry(
-					ta_peer->vdev->pdev->osif_pdev,
+					ta_peer->vdev->osif_vdev,
 					wds_src_mac,
 					ta_peer->mac_addr.raw,
 					flags);
@@ -393,7 +393,7 @@ dp_rx_wds_srcport_learn(struct dp_soc *soc,
 
 		if (sa_sw_peer_id != ta_peer->peer_ids[0]) {
 			ret = soc->cdp_soc.ol_ops->peer_update_wds_entry(
-					ta_peer->vdev->pdev->osif_pdev,
+					ta_peer->vdev->osif_vdev,
 					wds_src_mac,
 					ta_peer->mac_addr.raw,
 					flags);
diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c
index 2cd5ad1c843a..58ec24abbb51 100644
--- a/dp/wifi3.0/dp_tx.c
+++ b/dp/wifi3.0/dp_tx.c
@@ -2075,7 +2075,7 @@ void dp_tx_mec_handler(struct dp_vdev *vdev, uint8_t *status)
 	if (qdf_mem_cmp(mac_addr, vdev->mac_addr.raw, DP_MAC_ADDR_LEN) &&
 		!dp_peer_add_ast(soc, peer, mac_addr, dp_ast_type_mec)) {
 			soc->cdp_soc.ol_ops->peer_add_wds_entry(
-				vdev->pdev->osif_pdev,
+				vdev->osif_vdev,
 				mac_addr,
 				vdev->mac_addr.raw,
 				flags);