summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-03-26 13:08:28 -0600
committerLinux Build Service Account <lnxbuild@localhost>2017-03-26 13:08:28 -0600
commitd4ff2bbbb7fdfb0cc92d8074fd7d27c73099ee49 (patch)
tree57f5a69cea72f087d91cc6ca245ed05672f02c6c
parentb44c1da641a54d1d0f2c48021b6a85996ab7729a (diff)
parent1250e5aa4df809ad94d2e81b7e1757abc5587d9f (diff)
Promotion of wlan-cmn.driver.lnx.1.0-00139.
CRs Change ID Subject -------------------------------------------------------------------------------------------------------------- 688141 Idf94e6b41716ffceb5de1042e18cc3160d408200 Release 5.1.1.2C 2021793 Ib8bafb9a9fe45c62a15c45fa8a610da2074e058c qcacmn: Remove unnecessary QDF_ASSERT to avoid watchdog 2019280 I15f2c9d236ec55dd75b83a8336f918a0ef565c19 qcacmn: TXRX: Reduce the log spam in Kmsg 688141 Ib37b5b3287214c7ed1897c4a81a5a203f9824547 Release 5.1.1.2B Change-Id: I71f725d9cee952dca564d8e9c014fdc0b635d32e CRs-Fixed: 688141, 2021793, 2019280
-rw-r--r--VERSION.txt2
-rw-r--r--dp/inc/cdp_txrx_cmn.h2
-rw-r--r--hif/src/ce/ce_main.c6
3 files changed, 3 insertions, 7 deletions
diff --git a/VERSION.txt b/VERSION.txt
index aed472ee9aec..bd700fe15e15 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-Current Component wlan-cmn.driver.lnx.1.0 version 5.1.1.2A
+Current Component wlan-cmn.driver.lnx.1.0 version 5.1.1.2C
diff --git a/dp/inc/cdp_txrx_cmn.h b/dp/inc/cdp_txrx_cmn.h
index 15cd1b84ad72..96ab2f7e5926 100644
--- a/dp/inc/cdp_txrx_cmn.h
+++ b/dp/inc/cdp_txrx_cmn.h
@@ -394,8 +394,6 @@ void ol_txrx_fw_stats_cfg(
uint8_t cfg_stats_type,
uint32_t cfg_val);
-void ol_txrx_print_level_set(unsigned level);
-
#define TXRX_FW_STATS_TXSTATS 1
#define TXRX_FW_STATS_RXSTATS 2
#define TXRX_FW_STATS_RX_RATE_INFO 3
diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c
index fa7d5eacf104..563d4c94b8a8 100644
--- a/hif/src/ce/ce_main.c
+++ b/hif/src/ce/ce_main.c
@@ -1685,11 +1685,9 @@ static void hif_post_recv_buffers_failure(struct HIF_CE_pipe_info *pipe_info,
* there is no trigger to refill the ce and we will
* eventually crash
*/
- if (bufs_needed_tmp == CE_state->dest_ring->nentries - 1) {
-
- QDF_ASSERT(0);
+ if (bufs_needed_tmp == CE_state->dest_ring->nentries - 1)
qdf_sched_work(scn->qdf_dev, &CE_state->oom_allocation_work);
- }
+
}