diff options
| author | AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> | 2015-01-22 14:37:43 +0530 |
|---|---|---|
| committer | AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> | 2015-02-03 16:04:48 +0530 |
| commit | 37c2d6ae41e4b06823e2006d88df47b0cc9fe7fc (patch) | |
| tree | d435b429d6519873f0c68f7962d845a93c6ac579 | |
| parent | 88257d84c5c0d7c3c98dbf98554ac4bea7ef628f (diff) | |
qcacld: Info logs to indicate enable/disable queues
Add info logs to indicate when queues are enabled and disabled.
Change-Id: I4df687464d811e7f7e4d5b6b6669dee6a843e63b
CRs-Fixed: 785301
| -rw-r--r-- | CORE/EPPING/src/epping_txrx.c | 5 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_assoc.c | 10 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 1 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_dev_pwr.c | 3 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_early_suspend.c | 6 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_hostapd.c | 2 | ||||
| -rwxr-xr-x | CORE/HDD/src/wlan_hdd_main.c | 6 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_p2p.c | 1 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_softap_tx_rx.c | 8 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_tx_rx.c | 7 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_wext.c | 3 |
11 files changed, 47 insertions, 5 deletions
diff --git a/CORE/EPPING/src/epping_txrx.c b/CORE/EPPING/src/epping_txrx.c index 678d58e0cfae..cf8a31b5463a 100644 --- a/CORE/EPPING/src/epping_txrx.c +++ b/CORE/EPPING/src/epping_txrx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -244,6 +244,7 @@ static int epping_set_mac_address(struct net_device *dev, void *addr) static void epping_stop_adapter(epping_adapter_t *pAdapter) { if (pAdapter && pAdapter->started) { + EPPING_LOG(LOG1, FL("Disabling queues")); netif_tx_disable(pAdapter->dev); netif_carrier_off(pAdapter->dev); pAdapter->started = false; @@ -265,6 +266,7 @@ static int epping_start_adapter(epping_adapter_t *pAdapter) cnss_request_bus_bandwidth(CNSS_BUS_WIDTH_HIGH); #endif netif_carrier_on(pAdapter->dev); + EPPING_LOG(LOG1, FL("Enabling queues")); netif_tx_start_all_queues(pAdapter->dev); pAdapter->started = true; } else { @@ -380,6 +382,7 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, dev->watchdog_timeo = 5 * HZ; /* XXX */ dev->tx_queue_len = ATH_TXBUF-1; /* 1 for mgmt frame */ if (epping_register_adapter(pAdapter) == 0) { + EPPING_LOG(LOG1, FL("Disabling queues")); netif_tx_disable(dev); netif_carrier_off(dev); return pAdapter; diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c index 5eab6e044185..fd54e47dbeff 100644 --- a/CORE/HDD/src/wlan_hdd_assoc.c +++ b/CORE/HDD/src/wlan_hdd_assoc.c @@ -877,6 +877,7 @@ static eHalStatus hdd_DisConnectHandler( hdd_adapter_t *pAdapter, tCsrRoamInfo * } // notify apps that we can't pass traffic anymore + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(dev); netif_carrier_off(dev); pAdapter->hdd_stats.hddTxRxStats.netq_disable_cnt++; @@ -1730,6 +1731,7 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs /* Start the Queue - Start tx queues before hdd_roamRegisterSTA, since hdd_roamRegisterSTA will flush any cached data frames immediately */ + hddLog(LOG1, FL("Enabling queues")); netif_tx_wake_all_queues(dev); pAdapter->hdd_stats.hddTxRxStats.netq_enable_cnt++; pAdapter->hdd_stats.hddTxRxStats.netq_state_off = FALSE; @@ -1795,6 +1797,7 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs hddLog(VOS_TRACE_LEVEL_DEBUG, "LFR3:netif_tx_wake_all_queues"); } #endif + hddLog(LOG1, FL("Enabling queues")); netif_tx_wake_all_queues(dev); pAdapter->hdd_stats.hddTxRxStats.netq_enable_cnt++; pAdapter->hdd_stats.hddTxRxStats.netq_state_off = FALSE; @@ -1949,6 +1952,7 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs hdd_clearRoamProfileIe( pAdapter ); hdd_wmm_init( pAdapter ); + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(dev); netif_carrier_off(dev); pAdapter->hdd_stats.hddTxRxStats.netq_disable_cnt++; @@ -2101,7 +2105,6 @@ static void hdd_RoamIbssIndicationHandler( hdd_adapter_t *pAdapter, __func__, pAdapter->dev->name); return; } - cfg80211_ibss_joined(pAdapter->dev, bss->bssid, GFP_KERNEL); cfg80211_put_bss( #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) || defined(WITH_BACKPORTS) @@ -2524,6 +2527,7 @@ static eHalStatus roamRoamConnectStatusUpdateHandler( hdd_adapter_t *pAdapter, t } } netif_carrier_on(pAdapter->dev); + hddLog(LOG1, FL("Enabling queues")); netif_tx_start_all_queues(pAdapter->dev); break; } @@ -2565,6 +2569,7 @@ static eHalStatus roamRoamConnectStatusUpdateHandler( hdd_adapter_t *pAdapter, t 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(LOG1, FL("Disabling queues")); netif_tx_disable(pAdapter->dev); netif_carrier_off(pAdapter->dev); pAdapter->hdd_stats.hddTxRxStats.netq_disable_cnt++; @@ -3529,6 +3534,7 @@ hdd_smeRoamCallback(void *pContext, tCsrRoamInfo *pRoamInfo, tANI_U32 roamId, // after reassoc. { struct net_device *dev = pAdapter->dev; + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(dev); pAdapter->hdd_stats.hddTxRxStats.netq_disable_cnt++; pAdapter->hdd_stats.hddTxRxStats.netq_state_off = TRUE; @@ -3567,6 +3573,7 @@ hdd_smeRoamCallback(void *pContext, tCsrRoamInfo *pRoamInfo, tANI_U32 roamId, 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(LOG1, FL("Disabling queues")); netif_tx_disable(dev); pAdapter->hdd_stats.hddTxRxStats.netq_disable_cnt++; pAdapter->hdd_stats.hddTxRxStats.netq_state_off = TRUE; @@ -3596,6 +3603,7 @@ hdd_smeRoamCallback(void *pContext, tCsrRoamInfo *pRoamInfo, tANI_U32 roamId, if(roamResult == eCSR_ROAM_RESULT_LOSTLINK) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Roaming started due to connection lost"); + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(pAdapter->dev); netif_carrier_off(pAdapter->dev); pAdapter->hdd_stats.hddTxRxStats.netq_disable_cnt++; diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 5f841c908cc4..7889a413834e 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -11897,6 +11897,7 @@ int wlan_hdd_disconnect( hdd_adapter_t *pAdapter, u16 reason ) } /*stop tx queues*/ + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(pAdapter->dev); netif_carrier_off(pAdapter->dev); pHddCtx->isAmpAllowed = VOS_TRUE; diff --git a/CORE/HDD/src/wlan_hdd_dev_pwr.c b/CORE/HDD/src/wlan_hdd_dev_pwr.c index 8d9c7ef376b8..cfd4d1c91947 100644 --- a/CORE/HDD/src/wlan_hdd_dev_pwr.c +++ b/CORE/HDD/src/wlan_hdd_dev_pwr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -133,6 +133,7 @@ void hddDevTmTxBlockTimeoutHandler(void *usrData) /* Resume TX flow */ + hddLog(LOG1, 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 c0702974d3db..8be74e047da8 100644 --- a/CORE/HDD/src/wlan_hdd_early_suspend.c +++ b/CORE/HDD/src/wlan_hdd_early_suspend.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -314,6 +314,7 @@ VOS_STATUS hdd_enter_deep_sleep(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter) unsigned long rc; //Stop the Interface TX queue. + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(pAdapter->dev); netif_carrier_off(pAdapter->dev); @@ -1407,6 +1408,7 @@ void hdd_suspend_wlan(void (*callback)(void *callbackContext, boolean suspended) if (pHddCtx->cfg_ini->nEnableSuspend == WLAN_MAP_SUSPEND_TO_STANDBY) { //stop the interface before putting the chip to standby + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(pAdapter->dev); netif_carrier_off(pAdapter->dev); } @@ -1420,6 +1422,7 @@ void hdd_suspend_wlan(void (*callback)(void *callbackContext, boolean suspended) send_suspend_ind: //stop all TX queues before suspend + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(pAdapter->dev); /* Keep this suspend indication at the end (before processing next adaptor) @@ -1665,6 +1668,7 @@ void hdd_resume_wlan(void) send_resume_ind: //wake the tx queues + hddLog(LOG1, FL("Enabling queues")); netif_tx_wake_all_queues(pAdapter->dev); hdd_conf_resume_ind(pAdapter); diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c index 0aa087f0c3dc..08af58d97564 100644 --- a/CORE/HDD/src/wlan_hdd_hostapd.c +++ b/CORE/HDD/src/wlan_hdd_hostapd.c @@ -267,6 +267,7 @@ static int hdd_hostapd_open (struct net_device *dev) //Turn ON carrier state netif_carrier_on(dev); //Enable all Tx queues + hddLog(LOG1, FL("Enabling queues")); netif_tx_start_all_queues(dev); done: EXIT(); @@ -288,6 +289,7 @@ int hdd_hostapd_stop (struct net_device *dev) ENTER(); //Stop all tx queues + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(dev); //Turn OFF carrier state diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 5cc6da9a8b32..6d8e610c2b02 100755 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -8408,6 +8408,7 @@ int hdd_stop (struct net_device *dev) /* Disable TX on the interface, after this hard_start_xmit() will not * be called on that interface */ + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(pAdapter->dev); /* Mark the interface status as "down" for outside world */ @@ -9648,6 +9649,7 @@ hdd_adapter_t* hdd_open_adapter( hdd_context_t *pHddCtx, tANI_U8 session_type, #endif #endif //Stop the Interface TX queue. + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(pAdapter->dev); //netif_tx_disable(pWlanDev); netif_carrier_off(pAdapter->dev); @@ -9711,6 +9713,7 @@ hdd_adapter_t* hdd_open_adapter( hdd_context_t *pHddCtx, tANI_U8 session_type, goto err_free_netdev; } + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(pAdapter->dev); netif_carrier_off(pAdapter->dev); @@ -9788,6 +9791,7 @@ hdd_adapter_t* hdd_open_adapter( hdd_context_t *pHddCtx, tANI_U8 session_type, hdd_init_tx_rx( pAdapter ); //Stop the Interface TX queue. + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(pAdapter->dev); netif_carrier_off(pAdapter->dev); } @@ -10161,6 +10165,7 @@ VOS_STATUS hdd_stop_adapter( hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, ENTER(); + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(pAdapter->dev); netif_carrier_off(pAdapter->dev); switch(pAdapter->device_mode) @@ -10455,6 +10460,7 @@ VOS_STATUS hdd_reset_all_adapters( hdd_context_t *pHddCtx ) while ( NULL != pAdapterNode && VOS_STATUS_SUCCESS == status ) { pAdapter = pAdapterNode->pAdapter; + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(pAdapter->dev); netif_carrier_off(pAdapter->dev); diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c index 726843acfbab..e59e4612599e 100644 --- a/CORE/HDD/src/wlan_hdd_p2p.c +++ b/CORE/HDD/src/wlan_hdd_p2p.c @@ -1777,6 +1777,7 @@ static void hdd_wlan_tx_complete( hdd_adapter_t* pAdapter, netif_rx_ni( skb ); /* Enable Queues which we have disabled earlier */ + hddLog(LOG1, 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 f43f4e9b1973..0aa268446a50 100644 --- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c +++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -161,6 +161,7 @@ void hdd_softap_tx_resume_timer_expired_handler(void *adapter_context) return; } + hddLog(LOG1, FL("Enabling queues")); netif_tx_wake_all_queues(pAdapter->dev); return; } @@ -196,6 +197,7 @@ void hdd_softap_tx_resume_cb(void *adapter_context, vos_timer_stop(&pAdapter->tx_flow_control_timer); } + hddLog(LOG1, FL("Enabling queues")); netif_tx_wake_all_queues(pAdapter->dev); pAdapter->hdd_stats.hddTxRxStats.txflow_unpause_cnt++; pAdapter->hdd_stats.hddTxRxStats.is_txflow_paused = FALSE; @@ -204,6 +206,7 @@ void hdd_softap_tx_resume_cb(void *adapter_context, #if defined(CONFIG_PER_VDEV_TX_DESC_POOL) else if (VOS_FALSE == tx_resume) /* Pause TX */ { + hddLog(LOG1, FL("Disabling queues")); netif_tx_stop_all_queues(pAdapter->dev); if (VOS_TIMER_STATE_STOPPED == vos_timer_getCurrentState(&pAdapter->tx_flow_control_timer)) @@ -330,6 +333,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if ((pAdapter->tx_flow_timer_initialized == TRUE) && (VOS_TIMER_STATE_STOPPED == vos_timer_getCurrentState(&pAdapter->tx_flow_control_timer))) { + hddLog(LOG1, FL("Disabling queues")); netif_tx_stop_all_queues(dev); vos_timer_start(&pAdapter->tx_flow_control_timer, WLAN_SAP_HDD_TX_FLOW_CONTROL_OS_Q_BLOCK_TIME); @@ -1370,10 +1374,12 @@ VOS_STATUS hdd_softap_RegisterSTA( hdd_adapter_t *pAdapter, "Turn on Monitor the carrier"); netif_carrier_on(pmonAdapter->dev); //Enable Tx queue + hddLog(LOG1, FL("Enabling queues")); netif_tx_start_all_queues(pmonAdapter->dev); } netif_carrier_on(pAdapter->dev); //Enable Tx queue + hddLog(LOG1, 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 fd142dc0e710..66559e6854e4 100644 --- a/CORE/HDD/src/wlan_hdd_tx_rx.c +++ b/CORE/HDD/src/wlan_hdd_tx_rx.c @@ -283,6 +283,7 @@ void hdd_flush_ibss_tx_queues( hdd_adapter_t *pAdapter, v_U8_t STAId) size <= HDD_TX_QUEUE_LOW_WATER_MARK && netif_tx_queue_stopped(txq) ) { + hddLog(LOG1, FL("Enabling queue for queue %d"), i); netif_tx_start_queue(txq); pAdapter->isTxSuspended[i] = VOS_FALSE; } @@ -578,6 +579,7 @@ int hdd_mon_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { /* 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(LOG1, FL("Disabling queues")); netif_tx_stop_all_queues(pAdapter->dev); pAdapter->isTxSuspended[ac] = VOS_TRUE; spin_unlock(&pAdapter->wmm_tx_queue[ac].lock); @@ -648,6 +650,7 @@ void hdd_tx_resume_timer_expired_handler(void *adapter_context) return; } + hddLog(LOG1, FL("Enabling queues")); netif_tx_wake_all_queues(pAdapter->dev); pAdapter->hdd_stats.hddTxRxStats.txflow_unpause_cnt++; pAdapter->hdd_stats.hddTxRxStats.is_txflow_paused = FALSE; @@ -691,6 +694,7 @@ void hdd_tx_resume_cb(void *adapter_context, FL("flow control, tx queues un-pause avoided as we are in REASSOCIATING state")); return; } + hddLog(LOG1, FL("Enabling queues")); netif_tx_wake_all_queues(pAdapter->dev); pAdapter->hdd_stats.hddTxRxStats.txflow_unpause_cnt++; pAdapter->hdd_stats.hddTxRxStats.is_txflow_paused = FALSE; @@ -699,6 +703,7 @@ void hdd_tx_resume_cb(void *adapter_context, #if defined(CONFIG_PER_VDEV_TX_DESC_POOL) else if (VOS_FALSE == tx_resume) /* Pause TX */ { + hddLog(LOG1, FL("Disabling queues")); netif_tx_stop_all_queues(pAdapter->dev); if (VOS_TIMER_STATE_STOPPED == vos_timer_getCurrentState(&pAdapter->tx_flow_control_timer)) @@ -833,6 +838,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) pAdapter->sessionId, pAdapter->tx_flow_low_watermark, pAdapter->tx_flow_high_watermark_offset)) { + hddLog(LOG1, FL("Disabling queues")); netif_tx_stop_all_queues(dev); if ((pAdapter->tx_flow_timer_initialized == TRUE) && (VOS_TIMER_STATE_STOPPED == @@ -1597,6 +1603,7 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext, { /* During TX open duration, TX frame count is larger than threshold * Block TX during Sleep time */ + hddLog(LOG1, 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 c3fade4bc340..7ae1967f0a27 100644 --- a/CORE/HDD/src/wlan_hdd_wext.c +++ b/CORE/HDD/src/wlan_hdd_wext.c @@ -3146,6 +3146,7 @@ static void hdd_ocb_set_sched_callback(sir_ocb_set_sched_response_t *resp) resp->status = -1; } else { netif_carrier_on(adapter->dev); + hddLog(LOG1, FL("Enabling queues")); netif_tx_start_all_queues(adapter->dev); } @@ -3237,6 +3238,7 @@ static int iw_set_dot11p_channel_sched(struct net_device *dev, sched_req->resp = sched_resp; sched_req->callback = hdd_ocb_set_sched_callback; + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(adapter->dev); netif_carrier_off(adapter->dev); @@ -4560,6 +4562,7 @@ static int iw_set_mlme(struct net_device *dev, /* Resetting authKeyMgmt */ (WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter))->authKeyMgmt = 0; + hddLog(LOG1, FL("Disabling queues")); netif_tx_disable(dev); netif_carrier_off(dev); pAdapter->hdd_stats.hddTxRxStats.netq_disable_cnt++; |
