wlan: SAP: During SSR, don't check for logp in progress
In SAP mode, during SSR, observing unnecessary debug logs
due to logp in progress check. Also due to this check traffic
monitor timer is not restarted.
Don't check for logp in progress flag during SSR to avoid
unnecessary debug logs and to restart traffic monitor timer
cleanly.
Change-Id: Id115fb8a4b482d68c0fde0f57fc286864470f9a9
CRs-Fixed: 2002150
diff --git a/CORE/HDD/inc/wlan_hdd_hostapd.h b/CORE/HDD/inc/wlan_hdd_hostapd.h
index 8e83650..b16abbc 100644
--- a/CORE/HDD/inc/wlan_hdd_hostapd.h
+++ b/CORE/HDD/inc/wlan_hdd_hostapd.h
@@ -108,7 +108,7 @@
VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCallback);
-VOS_STATUS hdd_init_ap_mode( hdd_adapter_t *pAdapter );
+VOS_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter, bool re_init);
void hdd_set_ap_ops( struct net_device *pWlanHostapdDev );
int hdd_hostapd_stop (struct net_device *dev);
void hdd_restart_softap (hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter);
@@ -117,7 +117,7 @@
#endif /* FEATURE_WLAN_CH_AVOID */
int hdd_del_all_sta(hdd_adapter_t *pAdapter);
void hdd_sap_indicate_disconnect_for_sta(hdd_adapter_t *adapter);
-void hdd_sap_destroy_events(hdd_adapter_t *adapter);
+void hdd_sap_destroy_timers(hdd_adapter_t *adapter);
#ifdef SAP_AUTH_OFFLOAD
bool hdd_set_sap_auth_offload(hdd_adapter_t *pHostapdAdapter,
diff --git a/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h b/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
index d7c23ec..a41cc1c 100644
--- a/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
+++ b/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2013, 2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -114,7 +114,7 @@
@return : VOS_STATUS_E_FAILURE if any errors encountered
: VOS_STATUS_SUCCESS otherwise
===========================================================================*/
-extern VOS_STATUS hdd_softap_init_tx_rx( hdd_adapter_t *pAdapter );
+extern VOS_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter, bool re_init);
/**============================================================================
@brief hdd_softap_deinit_tx_rx() - Deinit function to clean up Tx/RX
@@ -124,7 +124,8 @@
@return : VOS_STATUS_E_FAILURE if any errors encountered
: VOS_STATUS_SUCCESS otherwise
===========================================================================*/
-extern VOS_STATUS hdd_softap_deinit_tx_rx( hdd_adapter_t *pAdapter );
+extern VOS_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter,
+ bool re_init);
/**============================================================================
@brief hdd_softap_init_tx_rx_sta() - Init function to initialize a station in Tx/RX
@@ -332,7 +333,7 @@
@return : VOS_STATUS_E_FAILURE if any errors encountered
========================================================================== */
-VOS_STATUS hdd_start_trafficMonitor( hdd_adapter_t *pAdapter );
+VOS_STATUS hdd_start_trafficMonitor(hdd_adapter_t *pAdapter, bool re_init);
/**==========================================================================
@@ -344,6 +345,6 @@
@return : VOS_STATUS_E_FAILURE if any errors encountered
========================================================================== */
-VOS_STATUS hdd_stop_trafficMonitor( hdd_adapter_t *pAdapter );
+VOS_STATUS hdd_stop_trafficMonitor( hdd_adapter_t *pAdapter, bool re_init);
#endif // end #if !defined( WLAN_HDD_SOFTAP_TX_RX_H )
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 3d33b36..71365ea 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -11279,7 +11279,7 @@
return -EINVAL;
}
}
- status = hdd_init_ap_mode(pAdapter);
+ status = hdd_init_ap_mode(pAdapter, false);
if(status != VOS_STATUS_SUCCESS)
{
hddLog(VOS_TRACE_LEVEL_FATAL,
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index a8f1921..72f8b5d 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -2791,7 +2791,7 @@
if (TRUE == *isSetTrafficMon)
{
pHddCtx->cfg_ini->enableTrafficMonitor= TRUE;
- if (VOS_STATUS_SUCCESS != hdd_start_trafficMonitor(pAdapter))
+ if (VOS_STATUS_SUCCESS != hdd_start_trafficMonitor(pAdapter, false))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
"%s: failed to Start Traffic Monitor timer ", __func__ );
@@ -2801,7 +2801,7 @@
else if (FALSE == *isSetTrafficMon)
{
pHddCtx->cfg_ini->enableTrafficMonitor= FALSE;
- if (VOS_STATUS_SUCCESS != hdd_stop_trafficMonitor(pAdapter))
+ if (VOS_STATUS_SUCCESS != hdd_stop_trafficMonitor(pAdapter, false))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
"%s: failed to Stop Traffic Monitor timer ", __func__ );
@@ -4971,7 +4971,7 @@
#endif
}
-VOS_STATUS hdd_init_ap_mode( hdd_adapter_t *pAdapter )
+VOS_STATUS hdd_init_ap_mode( hdd_adapter_t *pAdapter, bool re_init)
{
hdd_hostapd_state_t * phostapdBuf;
#ifdef DHCP_SERVER_OFFLOAD
@@ -4988,7 +4988,7 @@
v_U16_t unsafeChannelCount;
#endif /* FEATURE_WLAN_CH_AVOID */
- if (pHddCtx->isLogpInProgress) {
+ if (pHddCtx->isLogpInProgress && !re_init) {
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s:LOGP in Progress. Ignore!!!",__func__);
status = VOS_STATUS_E_FAILURE;
@@ -5080,7 +5080,7 @@
dev->wireless_handlers = (struct iw_handler_def *)& hostapd_handler_def;
//Initialize the data path module
- status = hdd_softap_init_tx_rx(pAdapter);
+ status = hdd_softap_init_tx_rx(pAdapter, re_init);
if ( !VOS_IS_STATUS_SUCCESS( status ))
{
hddLog(VOS_TRACE_LEVEL_FATAL, "%s: hdd_softap_init_tx_rx failed", __func__);
@@ -5100,7 +5100,7 @@
return status;
error_wmm_init:
- hdd_softap_deinit_tx_rx( pAdapter );
+ hdd_softap_deinit_tx_rx(pAdapter, re_init);
EXIT();
return status;
}
@@ -5196,7 +5196,7 @@
{
ENTER();
- hdd_softap_deinit_tx_rx(pAdapter);
+ hdd_softap_deinit_tx_rx(pAdapter, false);
/* if we are being called during driver unload, then the dev has already
been invalidated. if we are being called at other times, then we can
@@ -5236,7 +5236,9 @@
ENTER();
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
- if (0 != wlan_hdd_validate_context(hdd_ctx)) {
+ if (NULL == hdd_ctx || NULL == hdd_ctx->cfg_ini) {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: HDD context is Null", __func__);
return;
}
@@ -5286,21 +5288,24 @@
}
/**
- * hdd_sap_destroy_events() - Destroy sap evets
+ * hdd_sap_destroy_timers() - Destroy sap timers
* @adapter: sap adapter context
*
* Return: nothing
*/
-void hdd_sap_destroy_events(hdd_adapter_t *adapter)
+void hdd_sap_destroy_timers(hdd_adapter_t *adapter)
{
hdd_context_t *hdd_ctx;
v_CONTEXT_t vos_ctx;
ptSapContext sap_ctx;
+ VOS_STATUS status = VOS_STATUS_E_FAILURE;
ENTER();
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
- if (0 != wlan_hdd_validate_context(hdd_ctx)) {
+ if (NULL == hdd_ctx || NULL == hdd_ctx->cfg_ini) {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: HDD context is Null", __func__);
return;
}
@@ -5317,7 +5322,16 @@
return;
}
- if (!VOS_IS_STATUS_SUCCESS(vos_lock_destroy(&sap_ctx->SapGlobalLock)))
- VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
- FL("WLANSAP_Stop failed destroy lock"));
+ if (VOS_TIMER_STATE_RUNNING == sap_ctx->sap_HT2040_timer.state) {
+ status = vos_timer_stop(&sap_ctx->sap_HT2040_timer);
+ if (!VOS_IS_STATUS_SUCCESS(status))
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+ FL("Failed to Stop HT20/40 timer"));
+ }
+
+ status = vos_timer_destroy(&sap_ctx->sap_HT2040_timer);
+ if (!VOS_IS_STATUS_SUCCESS(status))
+ VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
+ FL("Failed to Destroy HT20/40 timer"));
+
}
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 94984b6..d0acd9a 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -8685,7 +8685,7 @@
pAdapter->device_mode = session_type;
hdd_initialize_adapter_common(pAdapter);
- status = hdd_init_ap_mode(pAdapter);
+ status = hdd_init_ap_mode(pAdapter, false);
if( VOS_STATUS_SUCCESS != status )
goto err_free_netdev;
@@ -9463,8 +9463,8 @@
vos_flush_work(&pHddCtx->sap_start_work);
hdd_sap_indicate_disconnect_for_sta(pAdapter);
hdd_cleanup_actionframe(pHddCtx, pAdapter);
- hdd_softap_deinit_tx_rx(pAdapter);
- hdd_sap_destroy_events(pAdapter);
+ hdd_softap_deinit_tx_rx(pAdapter, true);
+ hdd_sap_destroy_timers(pAdapter);
} else {
netif_carrier_off(pAdapter->dev);
}
@@ -9688,7 +9688,7 @@
case WLAN_HDD_SOFTAP:
if (pHddCtx->cfg_ini->sap_internal_restart) {
- hdd_init_ap_mode(pAdapter);
+ hdd_init_ap_mode(pAdapter, true);
status = hdd_sta_id_hash_attach(pAdapter);
if (VOS_STATUS_SUCCESS != status)
{
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index 5c6e396..2cb3b89 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -141,17 +141,19 @@
return;
}
-VOS_STATUS hdd_start_trafficMonitor( hdd_adapter_t *pAdapter )
+VOS_STATUS hdd_start_trafficMonitor( hdd_adapter_t *pAdapter, bool re_init)
{
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
VOS_STATUS status = VOS_STATUS_SUCCESS;
ENTER();
- status = wlan_hdd_validate_context(pHddCtx);
- if (0 != status)
- {
- return status;
+
+ if (!re_init) {
+ status = wlan_hdd_validate_context(pHddCtx);
+ if (-ENODEV == status) {
+ return status;
+ }
}
if ((pHddCtx->cfg_ini->enableTrafficMonitor) &&
@@ -182,16 +184,18 @@
return status;
}
-VOS_STATUS hdd_stop_trafficMonitor( hdd_adapter_t *pAdapter )
+VOS_STATUS hdd_stop_trafficMonitor( hdd_adapter_t *pAdapter, bool re_init)
{
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
VOS_STATUS status = VOS_STATUS_SUCCESS;
ENTER();
- status = wlan_hdd_validate_context(pHddCtx);
- if (-ENODEV == status)
- {
- return status;
+
+ if (!re_init){
+ status = wlan_hdd_validate_context(pHddCtx);
+ if (-ENODEV == status) {
+ return status;
+ }
}
if (pHddCtx->traffic_monitor.isInitialized)
@@ -867,7 +871,7 @@
@return : VOS_STATUS_E_FAILURE if any errors encountered
: VOS_STATUS_SUCCESS otherwise
===========================================================================*/
-VOS_STATUS hdd_softap_init_tx_rx( hdd_adapter_t *pAdapter )
+VOS_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter, bool re_init)
{
VOS_STATUS status = VOS_STATUS_SUCCESS;
v_SINT_t i = -1;
@@ -919,7 +923,7 @@
/* Update the AC weights suitable for SoftAP mode of operation */
WLANTL_SetACWeights((WLAN_HDD_GET_CTX(pAdapter))->pvosContext, pACWeights);
- if (VOS_STATUS_SUCCESS != hdd_start_trafficMonitor(pAdapter))
+ if (VOS_STATUS_SUCCESS != hdd_start_trafficMonitor(pAdapter, re_init))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SAP_DATA, VOS_TRACE_LEVEL_ERROR,
"%s: failed to start Traffic Monito timer ", __func__ );
@@ -936,11 +940,11 @@
@return : VOS_STATUS_E_FAILURE if any errors encountered
: VOS_STATUS_SUCCESS otherwise
===========================================================================*/
-VOS_STATUS hdd_softap_deinit_tx_rx( hdd_adapter_t *pAdapter )
+VOS_STATUS hdd_softap_deinit_tx_rx( hdd_adapter_t *pAdapter, bool re_init)
{
VOS_STATUS status = VOS_STATUS_SUCCESS;
- if (VOS_STATUS_SUCCESS != hdd_stop_trafficMonitor(pAdapter))
+ if (VOS_STATUS_SUCCESS != hdd_stop_trafficMonitor(pAdapter, re_init))
{
VOS_TRACE( VOS_MODULE_ID_HDD_SAP_DATA, VOS_TRACE_LEVEL_ERROR,
"%s: Fail to Stop Traffic Monito timer", __func__ );