From a22c2169fb38d1da275eca7caae17dc8873b1b07 Mon Sep 17 00:00:00 2001
From: Manjunathappa Prakash <prakashpm@codeaurora.org>
Date: Tue, 1 Mar 2016 03:21:55 -0800
Subject: [PATCH] qcacmn: Converged datapath APIs (set 1.1)

Add below changes:
1) Add peer handling functions.
2) Bring in the APIs under else(#else) part of compile time flags
   QCA_SUPPORT_TXRX_LOCAL_PEER_ID, QCA_COMPUTE_TX_DELAY and
   QCA_SUPPORT_TX_THROTTLE.

Change-Id: I08b101702a7d0d870e9fab9b8a3cc7cc19d3464f
CRs-Fixed: 993414
---
 dp/inc/cdp_txrx_peer_ops.h    | 15 ++++++++++++++-
 dp/inc/cdp_txrx_tx_delay.h    |  1 -
 dp/inc/cdp_txrx_tx_throttle.h | 13 +++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/dp/inc/cdp_txrx_peer_ops.h b/dp/inc/cdp_txrx_peer_ops.h
index 0c160c47bb..1bb90445ab 100644
--- a/dp/inc/cdp_txrx_peer_ops.h
+++ b/dp/inc/cdp_txrx_peer_ops.h
@@ -75,10 +75,23 @@ ol_txrx_find_peer_by_addr_and_vdev(ol_txrx_pdev_handle pdev,
 			 ol_txrx_vdev_handle vdev,
 			 uint8_t *peer_addr, uint8_t *peer_id);
 
+#ifdef QCA_SUPPORT_TXRX_LOCAL_PEER_ID
 uint16_t ol_txrx_local_peer_id(ol_txrx_peer_handle peer);
-
+ol_txrx_peer_handle ol_txrx_find_peer_by_addr(ol_txrx_pdev_handle pdev,
+					      uint8_t *peer_addr,
+					      uint8_t *peer_id);
+ol_txrx_peer_handle
+ol_txrx_find_peer_by_addr_and_vdev(ol_txrx_pdev_handle pdev,
+				   ol_txrx_vdev_handle vdev,
+				   uint8_t *peer_addr, uint8_t *peer_id);
 ol_txrx_peer_handle
 ol_txrx_peer_find_by_local_id(ol_txrx_pdev_handle pdev, uint8_t local_peer_id);
+#else
+#define ol_txrx_local_peer_id(peer) OL_TXRX_INVALID_LOCAL_PEER_ID
+#define ol_txrx_find_peer_by_addr(pdev, peer_addr, peer_id) NULL
+#define ol_txrx_find_peer_by_addr_and_vdev(pdev, vdev, peer_addr, peer_id) NULL
+#define ol_txrx_peer_find_by_local_id(pdev, local_peer_id) NULL
+#endif /* QCA_SUPPORT_TXRX_LOCAL_PEER_ID */
 
 QDF_STATUS
 ol_txrx_peer_state_update(ol_txrx_pdev_handle pdev, uint8_t *peer_addr,
diff --git a/dp/inc/cdp_txrx_tx_delay.h b/dp/inc/cdp_txrx_tx_delay.h
index ebca275720..16c749c0cd 100644
--- a/dp/inc/cdp_txrx_tx_delay.h
+++ b/dp/inc/cdp_txrx_tx_delay.h
@@ -44,7 +44,6 @@ void
 ol_tx_packet_count(ol_txrx_pdev_handle pdev,
 		 uint16_t *out_packet_count,
 		 uint16_t *out_packet_loss_count, int category);
-
 void ol_tx_set_compute_interval(ol_txrx_pdev_handle pdev,
 		 uint32_t interval);
 #else
diff --git a/dp/inc/cdp_txrx_tx_throttle.h b/dp/inc/cdp_txrx_tx_throttle.h
index 308e038ead..586806aae0 100644
--- a/dp/inc/cdp_txrx_tx_throttle.h
+++ b/dp/inc/cdp_txrx_tx_throttle.h
@@ -33,8 +33,21 @@
 #ifndef _CDP_TXRX_TX_THROTTLE_H_
 #define _CDP_TXRX_TX_THROTTLE_H_
 
+#if defined(QCA_SUPPORT_TX_THROTTLE)
 void ol_tx_throttle_init_period(struct ol_txrx_pdev_t *pdev, int period);
 
 void ol_tx_throttle_set_level(struct ol_txrx_pdev_t *pdev, int level);
+#else
+static inline void ol_tx_throttle_set_level(struct ol_txrx_pdev_t *pdev,
+					    int level)
+{
+	/* no-op */
+}
 
+static inline void ol_tx_throttle_init_period(struct ol_txrx_pdev_t *pdev,
+					      int period)
+{
+	/* no-op */
+}
+#endif
 #endif /* _CDP_TXRX_TX_THROTTLE_H_ */