qcacld: Reverting changes commited in 760999.

Original issue addressed with better solution.

Change-Id: I74918cc81566bb487e9521d07a6e5523a6500c46
CRs-Fixed: 679727

3 files changed, 23 insertions, 33 deletions

diff --git a/CORE/CLD_TXRX/TXRX/ol_tx_queue.c b/CORE/CLD_TXRX/TXRX/ol_tx_queue.c
index 92b8c0a0eaf7..0c0edc6b33b4 100644
--- a/CORE/CLD_TXRX/TXRX/ol_tx_queue.c
+++ b/CORE/CLD_TXRX/TXRX/ol_tx_queue.c
@@ -504,6 +504,27 @@ ol_txrx_throttle_unpause(ol_txrx_pdev_handle pdev)
 #endif
     ol_txrx_pdev_unpause(pdev);
 }
+
+void
+ol_txrx_pdev_pause(ol_txrx_pdev_handle pdev)
+{
+    struct ol_txrx_vdev_t *vdev = NULL, *tmp;
+
+    TAILQ_FOREACH_SAFE(vdev, &pdev->vdev_list, vdev_list_elem, tmp) {
+        ol_txrx_vdev_pause(vdev);
+    }
+}
+
+void
+ol_txrx_pdev_unpause(ol_txrx_pdev_handle pdev)
+{
+    struct ol_txrx_vdev_t *vdev = NULL, *tmp;
+
+    TAILQ_FOREACH_SAFE(vdev, &pdev->vdev_list, vdev_list_elem, tmp) {
+        ol_txrx_vdev_unpause(vdev);
+    }
+}
+
 #endif /* defined(CONFIG_HL_SUPPORT) */
 
 #if defined(CONFIG_HL_SUPPORT) || defined(QCA_SUPPORT_TXRX_VDEV_PAUSE_LL)
@@ -587,26 +608,6 @@ ol_txrx_vdev_flush(ol_txrx_vdev_handle vdev)
     }
 }
 
-void
-ol_txrx_pdev_pause(ol_txrx_pdev_handle pdev)
-{
-    struct ol_txrx_vdev_t *vdev = NULL, *tmp;
-
-    TAILQ_FOREACH_SAFE(vdev, &pdev->vdev_list, vdev_list_elem, tmp) {
-        ol_txrx_vdev_pause(vdev);
-    }
-}
-
-void
-ol_txrx_pdev_unpause(ol_txrx_pdev_handle pdev)
-{
-    struct ol_txrx_vdev_t *vdev = NULL, *tmp;
-
-    TAILQ_FOREACH_SAFE(vdev, &pdev->vdev_list, vdev_list_elem, tmp) {
-        ol_txrx_vdev_unpause(vdev);
-    }
-}
-
 #endif // defined(CONFIG_HL_SUPPORT) || defined(QCA_SUPPORT_TXRX_VDEV_PAUSE_LL)
 
 /*--- LL tx throttle queue code --------------------------------------------*/
diff --git a/CORE/SERVICES/COMMON/ol_txrx_ctrl_api.h b/CORE/SERVICES/COMMON/ol_txrx_ctrl_api.h
index e941965d58f8..bd98e07441a3 100644
--- a/CORE/SERVICES/COMMON/ol_txrx_ctrl_api.h
+++ b/CORE/SERVICES/COMMON/ol_txrx_ctrl_api.h
@@ -363,7 +363,7 @@ ol_txrx_throttle_unpause(ol_txrx_pdev_handle data_pdev);
  *
  * @param data_pdev - the physical device being paused
  */
-#if defined(CONFIG_HL_SUPPORT) || defined(QCA_SUPPORT_TXRX_VDEV_PAUSE_LL)
+#if defined(CONFIG_HL_SUPPORT)
 void
 ol_txrx_pdev_pause(ol_txrx_pdev_handle data_pdev);
 #else
@@ -378,7 +378,7 @@ ol_txrx_pdev_pause(ol_txrx_pdev_handle data_pdev);
  *
  * @param data_pdev - the physical device being unpaused
  */
-#if defined(CONFIG_HL_SUPPORT) || defined(QCA_SUPPORT_TXRX_VDEV_PAUSE_LL)
+#if defined(CONFIG_HL_SUPPORT)
 void
 ol_txrx_pdev_unpause(ol_txrx_pdev_handle data_pdev);
 #else
diff --git a/CORE/SERVICES/HIF/PCIe/if_pci.c b/CORE/SERVICES/HIF/PCIe/if_pci.c
index d2b43ce51b61..3214dbf3e8d9 100644
--- a/CORE/SERVICES/HIF/PCIe/if_pci.c
+++ b/CORE/SERVICES/HIF/PCIe/if_pci.c
@@ -1725,10 +1725,6 @@ hif_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         printk("%s: txrx_pdev is NULL\n", __func__);
         goto out;
     }
-
-    /* Pause all vdev */
-    ol_txrx_pdev_pause(txrx_pdev);
-
     /* Wait for pending tx completion */
     while (ol_txrx_get_tx_pending(txrx_pdev)) {
         msleep(OL_ATH_TX_DRAIN_WAIT_DELAY);
@@ -1835,7 +1831,6 @@ hif_pci_resume(struct pci_dev *pdev)
 {
     struct hif_pci_softc *sc = pci_get_drvdata(pdev);
     void *vos_context = vos_get_global_context(VOS_MODULE_ID_HIF, NULL);
-    ol_txrx_pdev_handle txrx_pdev = vos_get_context(VOS_MODULE_ID_TXRX, vos_context);
     struct HIF_CE_state *hif_state = (struct HIF_CE_state *)sc->hif_device;
     A_target_id_t targid = hif_state->targid;
     u32 val;
@@ -1921,12 +1916,6 @@ hif_pci_resume(struct pci_dev *pdev)
     else
         err = wma_disable_wow_in_fw(temp_module);
 
-    if (!txrx_pdev)
-        printk("%s: txrx_pdev is NULL\n", __func__);
-    else
-        /* Unpause all vdev */
-        ol_txrx_pdev_unpause(txrx_pdev);
-
 out:
     printk("%s: Resume completes %d\n", __func__, err);