diff options
| author | wadesong <wadesong@codeaurora.org> | 2017-04-14 14:28:40 +0800 |
|---|---|---|
| committer | wadesong <wadesong@codeaurora.org> | 2017-04-14 14:55:13 +0800 |
| commit | e4ede9c94bd7c5c4f11a02fe16f41f811dcc360a (patch) | |
| tree | 61d499c769458f07d48223748caadc92c9a781cc | |
| parent | 74477b09ef43a4d1ccfcdc32660684a3c6e30ac4 (diff) | |
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
| -rw-r--r-- | core/dp/htt/htt_rx.c | 4 | ||||
| -rw-r--r-- | core/dp/txrx/ol_txrx.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index eadcebd6d322..cccaba56fdd5 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -944,6 +944,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) { @@ -951,6 +952,7 @@ htt_rx_in_order_netbuf_pop(htt_pdev_handle pdev, qdf_dma_addr_t paddr) pdev->rx_ring.fill_cnt--; return htt_rx_hash_list_lookup(pdev, (uint32_t)(paddr & 0xffffffff)); } +#endif /* FIX ME: this function applies only to LL rx descs. An equivalent for HL rx descs is needed. */ @@ -2981,7 +2983,6 @@ int htt_rx_msdu_buff_in_order_replenish(htt_pdev_handle pdev, uint32_t num) return filled; } -#endif #define AR600P_ASSEMBLE_HW_RATECODE(_rate, _nss, _pream) \ (((_pream) << 6) | ((_nss) << 4) | (_rate)) @@ -3174,6 +3175,7 @@ qdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev, uint32_t paddr) return netbuf; } +#endif #ifndef CONFIG_HL_SUPPORT /* Initialization function of the rx buffer hash table. This function will diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 0f19a2e81c54..c2d127673e7a 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -78,6 +78,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" |