prima: Info logs to indicate enable/disable queues
Add info logs to indicate when queues are enabled and disabled.
Change-Id: I0e6b6d8641dc88b85ab7e6bc2265fe22b4dddece
CRs-Fixed: 774780
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 98369c6..ee08e8d 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -759,6 +759,7 @@
// Need to cleanup all queues only if the last peer leaves
if (eConnectionState_IbssDisconnected == pHddStaCtx->conn_info.connState)
{
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(pAdapter->dev);
netif_carrier_off(pAdapter->dev);
hdd_disconnect_tx_rx(pAdapter);
@@ -803,6 +804,7 @@
}
// notify apps that we can't pass traffic anymore
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(dev);
netif_carrier_off(dev);
//TxTimeoutCount need to reset in case of disconnect handler
@@ -1608,9 +1610,13 @@
vos_mem_zero( &pAdapter->hdd_stats.hddPmfStats,
sizeof(pAdapter->hdd_stats.hddPmfStats) );
#endif
+
// Start the Queue
if ( !hddDisconInProgress )
+ {
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Enabling queues"));
netif_tx_wake_all_queues(dev);
+ }
#ifdef DEBUG_ROAM_DELAY
vos_record_roam_event(e_HDD_ENABLE_TX_QUEUE, NULL, 0);
#endif
@@ -1750,6 +1756,7 @@
WLANTL_AssocFailed(pRoamInfo->staId);
}
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(dev);
netif_carrier_off(dev);
@@ -2329,6 +2336,7 @@
}
}
netif_carrier_on(pAdapter->dev);
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Enabling queues"));
netif_tx_start_all_queues(pAdapter->dev);
break;
}
@@ -2371,6 +2379,7 @@
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_MED,
"Received eCSR_ROAM_RESULT_IBSS_INACTIVE from SME");
// Stop only when we are inactive
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(pAdapter->dev);
netif_carrier_off(pAdapter->dev);
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
@@ -2816,6 +2825,7 @@
// after reassoc.
{
struct net_device *dev = pAdapter->dev;
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(dev);
#ifdef DEBUG_ROAM_DELAY
vos_record_roam_event(e_HDD_DISABLE_TX_QUEUE, NULL, 0);
@@ -2852,6 +2862,7 @@
struct net_device *dev = pAdapter->dev;
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
// notify apps that we can't pass traffic anymore
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(dev);
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
if (pHddStaCtx->ft_carrier_on == FALSE)
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index e6ac32a..da8ebb2 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -11499,6 +11499,7 @@
* the tx frames after BSS/STA has been deleted and will not send
* back a response resulting in WDI timeout
*/
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(pAdapter->dev);
netif_carrier_off(pAdapter->dev);
diff --git a/CORE/HDD/src/wlan_hdd_dev_pwr.c b/CORE/HDD/src/wlan_hdd_dev_pwr.c
index 1d89184..469a663 100644
--- a/CORE/HDD/src/wlan_hdd_dev_pwr.c
+++ b/CORE/HDD/src/wlan_hdd_dev_pwr.c
@@ -511,7 +511,7 @@
pHddCtx->tmInfo.txFrameCount = 0;
/* Resume TX flow */
-
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Enabling queues"));
netif_tx_wake_all_queues(staAdapater->dev);
pHddCtx->tmInfo.qBlocked = VOS_FALSE;
mutex_unlock(&pHddCtx->tmInfo.tmOperationLock);
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 9af13c4..3484ef2 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -311,6 +311,7 @@
long ret;
//Stop the Interface TX queue.
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(pAdapter->dev);
netif_carrier_off(pAdapter->dev);
@@ -1387,6 +1388,7 @@
if (pHddCtx->cfg_ini->nEnableSuspend == WLAN_MAP_SUSPEND_TO_STANDBY)
{
//stop the interface before putting the chip to standby
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(pAdapter->dev);
netif_carrier_off(pAdapter->dev);
}
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index 0cccd49..23ead26 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -188,6 +188,7 @@
//Turn ON carrier state
netif_carrier_on(dev);
//Enable all Tx queues
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Enabling queues"));
netif_tx_start_all_queues(dev);
EXIT();
@@ -221,6 +222,7 @@
ENTER();
if(NULL != dev) {
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
//Stop all tx queues
netif_tx_disable(dev);
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index d1459f6..bff18c0 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -5352,6 +5352,7 @@
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: Enabling Tx Queues", __func__);
/* Enable TX queues only when we are connected */
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Enabling queues"));
netif_tx_start_all_queues(dev);
}
@@ -5459,6 +5460,7 @@
/* Disable TX on the interface, after this hard_start_xmit() will not
* be called on that interface
*/
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(pAdapter->dev);
/* Mark the interface status as "down" for outside world */
@@ -6763,6 +6765,7 @@
}
#endif
//Stop the Interface TX queue.
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(pAdapter->dev);
//netif_tx_disable(pWlanDev);
netif_carrier_off(pAdapter->dev);
@@ -6805,7 +6808,7 @@
hdd_deinit_adapter(pHddCtx, pAdapter);
goto err_free_netdev;
}
-
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(pAdapter->dev);
netif_carrier_off(pAdapter->dev);
@@ -6880,6 +6883,7 @@
hdd_init_tx_rx( pAdapter );
//Stop the Interface TX queue.
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(pAdapter->dev);
netif_carrier_off(pAdapter->dev);
}
@@ -7385,6 +7389,7 @@
while ( NULL != pAdapterNode && VOS_STATUS_SUCCESS == status )
{
pAdapter = pAdapterNode->pAdapter;
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(pAdapter->dev);
netif_carrier_off(pAdapter->dev);
@@ -8158,6 +8163,7 @@
/* Disable TX on the interface, after this hard_start_xmit() will
* not be called on that interface
*/
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(pAdapter->dev);
/* Mark the interface status as "down" for outside world */
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 55474c7..50f9a54 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -2495,6 +2495,7 @@
netif_rx_ni( skb );
/* Enable Queues which we have disabled earlier */
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Enabling queues"));
netif_tx_start_all_queues( pAdapter->dev );
}
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index ee4fa40..a421c73 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -1906,10 +1906,12 @@
"Turn on Monitor the carrier");
netif_carrier_on(pmonAdapter->dev);
//Enable Tx queue
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Enabling queues"));
netif_tx_start_all_queues(pmonAdapter->dev);
}
netif_carrier_on(pAdapter->dev);
//Enable Tx queue
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Enabling queues"));
netif_tx_start_all_queues(pAdapter->dev);
return( vosStatus );
diff --git a/CORE/HDD/src/wlan_hdd_tx_rx.c b/CORE/HDD/src/wlan_hdd_tx_rx.c
index b40885e..5c6303e 100644
--- a/CORE/HDD/src/wlan_hdd_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_tx_rx.c
@@ -304,6 +304,7 @@
size <= HDD_TX_QUEUE_LOW_WATER_MARK &&
netif_tx_queue_stopped(txq) )
{
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Enabling queue for queue %d"),i);
netif_tx_start_queue(txq);
pAdapter->isTxSuspended[i] = VOS_FALSE;
++pAdapter->hdd_stats.hddTxRxStats.txDequeDePressured;
@@ -368,6 +369,7 @@
"%s: TX queue[%d] re-enabled", __func__, ac);
pAdapter->isTxSuspended[ac] = VOS_FALSE;
/* Enable Queues which we have disabled earlier */
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Enabling queues"));
netif_tx_start_all_queues( pAdapter->dev );
}
@@ -588,6 +590,7 @@
{
/* We want to process one packet at a time, so lets disable all TX queues
* and re-enable the queues once we get TX feedback for this packet */
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_stop_all_queues(pAdapter->dev);
pAdapter->isTxSuspended[ac] = VOS_TRUE;
spin_unlock(&pAdapter->wmm_tx_queue[ac].lock);
@@ -867,6 +870,7 @@
{
++pAdapter->hdd_stats.hddTxRxStats.txXmitBackPressured;
++pAdapter->hdd_stats.hddTxRxStats.txXmitBackPressuredAC[ac];
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queue for ac %d"),ac);
netif_tx_stop_queue(netdev_get_tx_queue(dev, skb_get_queue_mapping(skb)));
pAdapter->isTxSuspended[ac] = VOS_TRUE;
txSuspended = VOS_TRUE;
@@ -1826,6 +1830,7 @@
{
/* During TX open duration, TX frame count is larger than threshold
* Block TX during Sleep time */
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_stop_all_queues(pAdapter->dev);
pHddCtx->tmInfo.qBlocked = VOS_TRUE;
pHddCtx->tmInfo.lastblockTs = timestamp;
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index db186c1..75db0b2 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -4635,6 +4635,7 @@
/* Resetting authKeyMgmt */
(WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter))->authKeyMgmt = 0;
+ hddLog(VOS_TRACE_LEVEL_INFO, FL("Disabling queues"));
netif_tx_disable(dev);
netif_carrier_off(dev);