diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-14 07:19:47 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-14 07:19:47 -0700 |
| commit | 858a182d715975facd37b3df5b4e56b171ec9c9e (patch) | |
| tree | d4c0a97f22e2030f532f2095f813cf5681d4af6e | |
| parent | 56742863cc9b1c19c93106f4e6a455c7c18fafe5 (diff) | |
| parent | e4ede9c94bd7c5c4f11a02fe16f41f811dcc360a (diff) | |
Merge "qcacld-3.0: Fix build errors introduced by data path code changes"
| -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 566c5c616a7f..a2a087d2cce9 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -960,6 +960,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) { @@ -968,6 +969,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. An equivalent for HL rx descs is needed. */ @@ -2998,7 +3000,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)) @@ -3198,6 +3199,7 @@ qdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev, 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 9b988a700fb8..a359cd158801 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" |