Browse Source

qcacld-3.0: Fix build errors introduced by data path code changes

Some data path code change didn't consider SDIO code path, so
introducing some build error for SDIO driver. Fix them in one
submission to enable ACI

Change-Id: I3d1b81c57a8ae854f18db3eccb546b7b552899b7
CRs-Fixed: 2033757
wadesong 8 years ago
parent
commit
9e95bd99fa
2 changed files with 5 additions and 0 deletions
  1. 4 0
      core/dp/htt/htt_rx.c
  2. 1 0
      core/dp/txrx/ol_txrx.c

+ 4 - 0
core/dp/htt/htt_rx.c

@@ -999,6 +999,7 @@ static inline qdf_nbuf_t htt_rx_netbuf_pop(htt_pdev_handle pdev)
 	return msdu;
 }
 
+#ifndef CONFIG_HL_SUPPORT
 static inline qdf_nbuf_t
 htt_rx_in_order_netbuf_pop(htt_pdev_handle pdev, qdf_dma_addr_t paddr)
 {
@@ -1007,6 +1008,7 @@ htt_rx_in_order_netbuf_pop(htt_pdev_handle pdev, qdf_dma_addr_t paddr)
 	paddr = htt_paddr_trim_to_37(paddr);
 	return htt_rx_hash_list_lookup(pdev, paddr);
 }
+#endif
 
 /*
  * FIX ME: this function applies only to LL rx descs.
@@ -3170,6 +3172,7 @@ void htt_rx_msdu_buff_replenish(htt_pdev_handle pdev)
 	qdf_atomic_inc(&pdev->rx_ring.refill_ref_cnt);
 }
 
+#ifndef CONFIG_HL_SUPPORT
 #define RX_RING_REFILL_DEBT_MAX 128
 int htt_rx_msdu_buff_in_order_replenish(htt_pdev_handle pdev, uint32_t num)
 {
@@ -3418,6 +3421,7 @@ qdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev,
 
 	return netbuf;
 }
+#endif
 
 /*
  * Initialization function of the rx buffer hash table. This function will

+ 1 - 0
core/dp/txrx/ol_txrx.c

@@ -77,6 +77,7 @@
 #include <cdp_txrx_pmf.h>
 #include "wma.h"
 #include "hif.h"
+#include "hif_main.h"
 #include <cdp_txrx_peer_ops.h>
 #ifndef REMOVE_PKT_LOG
 #include "pktlog_ac.h"