From e70a7b87d04e4b3503e834b492b003f7846053cb Mon Sep 17 00:00:00 2001
From: Vivek <quic_vchettri@quicinc.com>
Date: Mon, 18 Jul 2022 17:01:44 +0530
Subject: [PATCH] qcacmn: Add mac address to peer unmap ops

On receiving the peer unmap event the ops
is called without the mac address of the
peer for which peer unmap is received.

Add mac address of the peer for which peer
unmap is received.

Change-Id: I9026433089963818d5a227a0660866ff504dea84
CRs-Fixed: 3238626
---
 dp/inc/cdp_txrx_ops.h |  8 ++------
 dp/wifi3.0/dp_peer.c  | 35 ++++-------------------------------
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/dp/inc/cdp_txrx_ops.h b/dp/inc/cdp_txrx_ops.h
index d9a52a59a4..ee520ed240 100644
--- a/dp/inc/cdp_txrx_ops.h
+++ b/dp/inc/cdp_txrx_ops.h
@@ -1315,15 +1315,11 @@ struct ol_if_ops {
 			       uint8_t vdev_id, uint8_t *peer_mac_addr,
 			       enum cdp_txrx_ast_entry_type peer_type,
 			       uint32_t tx_ast_hashidx);
-#ifdef IPA_OFFLOAD
+
 	int (*peer_unmap_event)(struct cdp_ctrl_objmgr_psoc *psoc,
 				uint16_t peer_id,
 				uint8_t vdev_id, uint8_t *mac_addr);
-#else
-	int (*peer_unmap_event)(struct cdp_ctrl_objmgr_psoc *psoc,
-				uint16_t peer_id,
-				uint8_t vdev_id);
-#endif
+
 	int (*get_dp_cfg_param)(struct cdp_ctrl_objmgr_psoc *psoc,
 				enum cdp_cfg_param_type param_num);
 
diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c
index 0156c3488f..2ce4503699 100644
--- a/dp/wifi3.0/dp_peer.c
+++ b/dp/wifi3.0/dp_peer.c
@@ -2997,36 +2997,6 @@ dp_rx_peer_map_handler(struct dp_soc *soc, uint16_t peer_id,
 	return err;
 }
 
-#ifdef IPA_OFFLOAD
-/**
- * dp_rx_peer_unmap_event() - Peer unmap event
- * @soc_handle - genereic soc handle
- * @peer_id - peer_id from firmware
- * @vdev_id - vdev ID
- * @mac_addr - mac address of the peer or wds entry
- *
- * Return: none
- */
-static inline void
-dp_rx_peer_unmap_event(struct dp_soc *soc, uint16_t peer_id,
-		       uint8_t vdev_id, uint8_t *mac_addr)
-{
-	if (soc->cdp_soc.ol_ops->peer_unmap_event) {
-		soc->cdp_soc.ol_ops->peer_unmap_event(soc->ctrl_psoc,
-				peer_id, vdev_id, mac_addr);
-	}
-}
-#else
-static inline void
-dp_rx_peer_unmap_event(struct dp_soc *soc, uint16_t peer_id,
-		       uint8_t vdev_id, uint8_t *mac_addr)
-{
-	if (soc->cdp_soc.ol_ops->peer_unmap_event) {
-		soc->cdp_soc.ol_ops->peer_unmap_event(soc->ctrl_psoc,
-				peer_id, vdev_id);
-	}
-}
-#endif
 /**
  * dp_rx_peer_unmap_handler() - handle peer unmap event from firmware
  * @soc_handle - genereic soc handle
@@ -3105,7 +3075,10 @@ dp_rx_peer_unmap_handler(struct dp_soc *soc, uint16_t peer_id,
 	if (!soc->ast_offload_support)
 		dp_peer_reset_flowq_map(peer);
 
-	dp_rx_peer_unmap_event(soc, peer_id, vdev_id, peer->mac_addr.raw);
+	if (soc->cdp_soc.ol_ops->peer_unmap_event) {
+		soc->cdp_soc.ol_ops->peer_unmap_event(soc->ctrl_psoc,
+				peer_id, vdev_id, mac_addr);
+	}
 
 	vdev = peer->vdev;
 	dp_update_vdev_stats_on_peer_unmap(vdev, peer);