commit 0308cd9a942e77789f960067984981ab51059ec6
author Linux Build Service Account <lnxbuild@localhost> Fri Jul 31 01:22:54 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jul 31 01:22:54 2015 -0700
tree 52936af2e06d7fd750e724715bab84064a9c77b0
parent 18ab21bcaea12e01107e3fd857327ad45ad6564b
parent 314cbfa78bcfaf1ec37665aa1b56b9a8dc3b5379

Merge "wlan: Qtimer for Apps"

CORE/DXE/src/wlan_qct_dxe.c

diff --git a/CORE/DXE/src/wlan_qct_dxe.c b/CORE/DXE/src/wlan_qct_dxe.c
index 5b28e8d..21408b6 100644
--- a/CORE/DXE/src/wlan_qct_dxe.c
+++ b/CORE/DXE/src/wlan_qct_dxe.c
@@ -2107,10 +2107,11 @@
                                            channelEntry,
                                            currentCtrlBlk);
 
-      if((eWLAN_PAL_STATUS_SUCCESS != status))
+      if((eWLAN_PAL_STATUS_SUCCESS != status) &&
+         (eWLAN_PAL_STATUS_E_EXISTS != status))
       {
          HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_WARN,
-                  "%s, out of RX buffer pool, break here",__func__);
+                  "dxeRXFrameRefillRing, out of RX buffer pool, break here");
          break;
       }
 

CORE/WDI/WPAL/src/wlan_qct_pal_device.c

diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_device.c b/CORE/WDI/WPAL/src/wlan_qct_pal_device.c
index dcca01f..1c08371 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_device.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_device.c
@@ -103,6 +103,7 @@
    u64              *rx_enable_return;
    u8               rx_isr_enable_failure;
    u8               rx_isr_enable_partial_failure;
+   u8               tx_isr_enabled;
 } wcnss_env;
 
 static wcnss_env  gEnv;
@@ -360,13 +361,12 @@
            gpEnv->rx_isr_enable_partial_failure = 1;
             /* not fatal -- keep on going */
          }
-         gpEnv->rx_isr_enabled = 1;
       }
       else
       {
          enable_irq(gpEnv->rx_irq);
-         gpEnv->rx_isr_enabled = 1;
       }
+      gpEnv->rx_isr_enabled = 1;
       break;
    case DXE_INTERRUPT_TX_COMPLE:
       if (!gpEnv->tx_registered) 
@@ -394,6 +394,7 @@
       {
          enable_irq(gpEnv->tx_irq);
       }
+      gpEnv->tx_isr_enabled = 1;
       break;
    default:
       WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
@@ -438,6 +439,7 @@
       break;
    case DXE_INTERRUPT_TX_COMPLE:
       disable_irq_nosync(gpEnv->tx_irq);
+      gpEnv->tx_isr_enabled = 0;
       break;
    default:
       WPAL_TRACE(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,