From 8b58459630764e123951da01ea235ac2954672f3 Mon Sep 17 00:00:00 2001
From: Chaithanya Garrepalli <cgarre@codeaurora.org>
Date: Wed, 11 Sep 2019 16:19:08 +0530
Subject: [PATCH] qcacmn: remove unused rx_opt_proc from dp_peer

Cleanup unused rx_opt_proc from dp_peer

Change-Id: I83401689f408f04c6f084dd83eb40dfacb295919
---
 dp/wifi3.0/dp_internal.h |  2 --
 dp/wifi3.0/dp_main.c     |  5 -----
 dp/wifi3.0/dp_peer.c     | 18 ------------------
 dp/wifi3.0/dp_types.h    |  8 --------
 4 files changed, 33 deletions(-)

diff --git a/dp/wifi3.0/dp_internal.h b/dp/wifi3.0/dp_internal.h
index 235da64376..fef10292f2 100644
--- a/dp/wifi3.0/dp_internal.h
+++ b/dp/wifi3.0/dp_internal.h
@@ -778,8 +778,6 @@ void dp_peer_cleanup(struct dp_vdev *vdev, struct dp_peer *peer,
 void dp_peer_rx_cleanup(struct dp_vdev *vdev, struct dp_peer *peer,
 			bool reuse);
 void dp_peer_unref_delete(struct dp_peer *peer);
-extern void dp_rx_discard(struct dp_vdev *vdev, struct dp_peer *peer,
-	unsigned tid, qdf_nbuf_t msdu_list);
 extern void *dp_find_peer_by_addr(struct cdp_pdev *dev,
 	uint8_t *peer_mac_addr, uint8_t *peer_id);
 extern struct dp_peer *dp_peer_find_hash_find(struct dp_soc *soc,
diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c
index 75f018262c..51d76e33b7 100644
--- a/dp/wifi3.0/dp_main.c
+++ b/dp/wifi3.0/dp_main.c
@@ -5256,9 +5256,6 @@ static void *dp_peer_create_wifi3(struct cdp_vdev *vdev_handle,
 	qdf_mem_copy(
 		&peer->mac_addr.raw[0], peer_mac_addr, QDF_MAC_ADDR_SIZE);
 
-	/* TODO: See of rx_opt_proc is really required */
-	peer->rx_opt_proc = soc->rx_opt_proc;
-
 	/* initialize the peer_id */
 	for (i = 0; i < MAX_NUM_PEER_ID_PER_PEER; i++)
 		peer->peer_ids[i] = HTT_INVALID_PEER;
@@ -6016,8 +6013,6 @@ static void dp_peer_delete_wifi3(void *peer_handle, uint32_t bitmap)
 	 * discard func
 	 */
 
-	peer->rx_opt_proc = dp_rx_discard;
-
 	/* Do not make ctrl_peer to NULL for connected sta peers.
 	 * We need ctrl_peer to release the reference during dp
 	 * peer free. This reference was held for
diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c
index 07aa27359f..cb9cfe3fff 100644
--- a/dp/wifi3.0/dp_peer.c
+++ b/dp/wifi3.0/dp_peer.c
@@ -2758,24 +2758,6 @@ int dp_delba_tx_completion_wifi3(void *peer_handle,
 	return QDF_STATUS_SUCCESS;
 }
 
-void dp_rx_discard(struct dp_vdev *vdev, struct dp_peer *peer, unsigned tid,
-	qdf_nbuf_t msdu_list)
-{
-	while (msdu_list) {
-		qdf_nbuf_t msdu = msdu_list;
-
-		msdu_list = qdf_nbuf_next(msdu_list);
-		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH,
-			  "discard rx %pK from partly-deleted peer %pK (%02x:%02x:%02x:%02x:%02x:%02x)",
-			  msdu, peer,
-			  peer->mac_addr.raw[0], peer->mac_addr.raw[1],
-			  peer->mac_addr.raw[2], peer->mac_addr.raw[3],
-			  peer->mac_addr.raw[4], peer->mac_addr.raw[5]);
-		qdf_nbuf_free(msdu);
-	}
-}
-
-
 /**
  * dp_set_pn_check_wifi3() - enable PN check in REO for security
  * @peer: Datapath peer handle
diff --git a/dp/wifi3.0/dp_types.h b/dp/wifi3.0/dp_types.h
index e4187369d3..3870ac6ab7 100644
--- a/dp/wifi3.0/dp_types.h
+++ b/dp/wifi3.0/dp_types.h
@@ -1941,14 +1941,6 @@ struct dp_peer {
 		u_int32_t michael_key[2]; /* relevant for TKIP */
 	} security[2]; /* 0 -> multicast, 1 -> unicast */
 
-	/*
-	* rx proc function: this either is a copy of pdev's rx_opt_proc for
-	* regular rx processing, or has been redirected to a /dev/null discard
-	* function when peer deletion is in progress.
-	*/
-	void (*rx_opt_proc)(struct dp_vdev *vdev, struct dp_peer *peer,
-		unsigned tid, qdf_nbuf_t msdu_list);
-
 	/* NAWDS Flag and Bss Peer bit */
 	uint8_t nawds_enabled:1, /* NAWDS flag */
 		bss_peer:1, /* set for bss peer */