qcacld-3.0: fix compilation errors for HL target

For HL target, CONFIG_HL_SUPPORT is enabled, which
cause sevaral compilation errors.
1. Couldn't find the definition of adf_xxx APIs.
   Replace adf_xxx APIs with qdf_xxx APIs.

2. ol_tx_msdu_id_storage() return a wrong value,
   implementation and definition mismatch.
   Correct the return value to: pointer to tx desc_id.

3. Some of CONFIG_HL_SUPPORT/FEATURE_WLAN_TDLS feature
   related code are not embraced by the macro properly.
   Embrace the code with right macro for each feature.

Change-Id: Ibf09fd78f85327200dede8c32bc215208e54b798
CRs-Fixed: 2004340

6 files changed, 16 insertions, 17 deletions

diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c
index 6e9c735a66d3..c0e0ec442aa3 100644
--- a/core/dp/htt/htt_rx.c
+++ b/core/dp/htt/htt_rx.c
@@ -1410,12 +1410,12 @@ htt_rx_offload_msdu_pop_hl(htt_pdev_handle pdev,
 			   qdf_nbuf_t *head_buf,
 			   qdf_nbuf_t *tail_buf)
 {
-	adf_nbuf_t buf;
+	qdf_nbuf_t buf;
 	u_int32_t *msdu_hdr, msdu_len;
 	int ret = 0;
 
 	*head_buf = *tail_buf = buf = offload_deliver_msg;
-	msdu_hdr = (u_int32_t *)adf_nbuf_data(buf);
+	msdu_hdr = (u_int32_t *)qdf_nbuf_data(buf);
 	/* First dword */
 
 	/* Second dword */
@@ -1429,15 +1429,15 @@ htt_rx_offload_msdu_pop_hl(htt_pdev_handle pdev,
 	*tid = HTT_RX_OFFLOAD_DELIVER_IND_MSDU_TID_GET(*msdu_hdr);
 	*fw_desc = HTT_RX_OFFLOAD_DELIVER_IND_MSDU_DESC_GET(*msdu_hdr);
 
-	adf_nbuf_pull_head(buf, HTT_RX_OFFLOAD_DELIVER_IND_MSDU_HDR_BYTES \
+	qdf_nbuf_pull_head(buf, HTT_RX_OFFLOAD_DELIVER_IND_MSDU_HDR_BYTES \
 			+ HTT_RX_OFFLOAD_DELIVER_IND_HDR_BYTES);
 
-	if (msdu_len <= adf_nbuf_len(buf)) {
-		adf_nbuf_set_pktlen(buf, msdu_len);
+	if (msdu_len <= qdf_nbuf_len(buf)) {
+		qdf_nbuf_set_pktlen(buf, msdu_len);
 	} else {
-		adf_os_print("%s: drop frame with invalid msdu len %d %d\n",
-				__FUNCTION__, msdu_len, (int)adf_nbuf_len(buf));
-		adf_nbuf_free(offload_deliver_msg);
+		qdf_print("%s: drop frame with invalid msdu len %d %d\n",
+				__FUNCTION__, msdu_len, (int)qdf_nbuf_len(buf));
+		qdf_nbuf_free(offload_deliver_msg);
 		ret = -1;
 	}
 
diff --git a/core/dp/ol/inc/ol_txrx_htt_api.h b/core/dp/ol/inc/ol_txrx_htt_api.h
index f589521aed1d..c778515a7ba1 100644
--- a/core/dp/ol/inc/ol_txrx_htt_api.h
+++ b/core/dp/ol/inc/ol_txrx_htt_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -41,7 +41,7 @@
 #ifdef CONFIG_HL_SUPPORT
 static inline uint16_t *ol_tx_msdu_id_storage(qdf_nbuf_t msdu)
 {
-	return QDF_NBUF_CB_TX_DESC_ID(msdu);
+	return (uint16_t *) (&QDF_NBUF_CB_TX_DESC_ID(msdu));
 
 }
 #else
diff --git a/core/dp/txrx/ol_tx_classify.c b/core/dp/txrx/ol_tx_classify.c
index 8c72cda2b906..5565bb6450e4 100644
--- a/core/dp/txrx/ol_tx_classify.c
+++ b/core/dp/txrx/ol_tx_classify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -392,9 +392,7 @@ ol_tx_classify(
 	struct ol_tx_frms_queue_t *txq = NULL;
 	A_UINT8 *dest_addr;
 	A_UINT8 tid;
-#if defined(CONFIG_HL_SUPPORT) && defined(FEATURE_WLAN_TDLS)
 	u_int8_t peer_id;
-#endif
 
 	TX_SCHED_DEBUG_PRINT("Enter %s\n", __func__);
 	dest_addr = ol_tx_dest_addr_find(pdev, tx_nbuf);
@@ -533,7 +531,6 @@ ol_tx_classify(
 				peer = ol_txrx_assoc_peer_find(vdev);
 			}
 #endif
-
 			peer = ol_tx_tdls_peer_find(pdev, vdev, &peer_id);
 		} else {
 			peer = ol_txrx_peer_find_hash_find(pdev, dest_addr,
diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c
index 628a9afc9a2c..118e79a3b745 100644
--- a/core/dp/txrx/ol_tx_send.c
+++ b/core/dp/txrx/ol_tx_send.c
@@ -488,6 +488,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev,
 #endif /* !QCA_TX_STD_PATH_ONLY */
 #endif /* QCA_TX_SINGLE_COMPLETIONS */
 
+#if !defined(CONFIG_HL_SUPPORT)
 void ol_tx_discard_target_frms(ol_txrx_pdev_handle pdev)
 {
 	int i = 0;
@@ -511,6 +512,7 @@ void ol_tx_discard_target_frms(ol_txrx_pdev_handle pdev)
 		}
 	}
 }
+#endif
 
 void ol_tx_credit_completion_handler(ol_txrx_pdev_handle pdev, int credits)
 {
diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c
index c7b32b4b3445..9540d71699dc 100644
--- a/core/dp/txrx/ol_txrx.c
+++ b/core/dp/txrx/ol_txrx.c
@@ -88,7 +88,8 @@
 #include "wma_api.h"
 
 #include <htt_internal.h>
-#ifdef CONFIG_HL_SUPPORT
+
+#if defined(CONFIG_HL_SUPPORT) && defined(FEATURE_WLAN_TDLS)
 
 /**
  * ol_txrx_copy_mac_addr_raw() - copy raw mac addr
diff --git a/core/dp/txrx/ol_txrx.h b/core/dp/txrx/ol_txrx.h
index b38caeb2c582..b476c8b98eda 100644
--- a/core/dp/txrx/ol_txrx.h
+++ b/core/dp/txrx/ol_txrx.h
@@ -85,8 +85,7 @@ ol_txrx_hl_tdls_flag_reset(struct ol_txrx_vdev_t *vdev, bool flag)
 }
 #endif
 
-#ifdef CONFIG_HL_SUPPORT
-
+#if defined(CONFIG_HL_SUPPORT) && defined(FEATURE_WLAN_TDLS)
 void
 ol_txrx_copy_mac_addr_raw(ol_txrx_vdev_handle vdev, uint8_t *bss_addr);