wlan: Change the behavior of isLoadUnloadInProgres
Some APIs (wlan_hdd_linux_reg_notifier) can be allowed to execute if
driver load is in progress but should be blocked if driver unload is in
progress, to be able to cater to the needs of such APIs change
isLoadUnloadInProgress so that it can distinguish between driver load
and unload.
Change-Id: I80d42a2b1cc2e161c5405bcc8440f3fb02c6d4a7
CRs-Fixed: 629537
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 8a40e70..15f8df5 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -533,6 +533,13 @@
WLAN_HDD_TM_LEVEL_MAX
} WLAN_TmLevelEnumType;
+typedef enum
+{
+ WLAN_HDD_NO_LOAD_UNLOAD_IN_PROGRESS = 0 ,
+ WLAN_HDD_LOAD_IN_PROGRESS = 1<<0,
+ WLAN_HDD_UNLOAD_IN_PROGRESS = 1<<1,
+}load_unload_sequence;
+
/* Driver Action based on thermal mitigation level structure */
typedef struct
{
@@ -1139,7 +1146,7 @@
struct completion ssr_comp_var;
- v_BOOL_t isLoadUnloadInProgress;
+ v_U8_t isLoadUnloadInProgress;
/**Track whether driver has been suspended.*/
hdd_ps_state_t hdd_ps_state;
@@ -1268,7 +1275,15 @@
};
+#define WLAN_HDD_IS_LOAD_IN_PROGRESS(pHddCtx) \
+ (pHddCtx->isLoadUnloadInProgress & WLAN_HDD_LOAD_IN_PROGRESS)
+#define WLAN_HDD_IS_UNLOAD_IN_PROGRESS(pHddCtx) \
+ (pHddCtx->isLoadUnloadInProgress & WLAN_HDD_UNLOAD_IN_PROGRESS)
+
+#define WLAN_HDD_IS_LOAD_UNLOAD_IN_PROGRESS(pHddCtx) \
+ (pHddCtx->isLoadUnloadInProgress & \
+ (WLAN_HDD_UNLOAD_IN_PROGRESS | WLAN_HDD_UNLOAD_IN_PROGRESS))
/*---------------------------------------------------------------------------
Function declarations and documenation
-------------------------------------------------------------------------*/
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index a765690..3a01008 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -674,7 +674,7 @@
msg = NULL;
/*During the WLAN uninitialization,supplicant is stopped before the
driver so not sending the status of the connection to supplicant*/
- if(pHddCtx->isLoadUnloadInProgress != TRUE)
+ if(pHddCtx->isLoadUnloadInProgress == WLAN_HDD_NO_LOAD_UNLOAD_IN_PROGRESS)
{
wireless_send_event(dev, we_event, &wrqu, msg);
#ifdef FEATURE_WLAN_ESE
@@ -787,7 +787,7 @@
{
/*During the WLAN uninitialization,supplicant is stopped before the
driver so not sending the status of the connection to supplicant*/
- if(pHddCtx->isLoadUnloadInProgress != TRUE)
+ if(pHddCtx->isLoadUnloadInProgress == WLAN_HDD_NO_LOAD_UNLOAD_IN_PROGRESS)
{
hddLog(VOS_TRACE_LEVEL_INFO_HIGH,
"%s: sent disconnected event to nl80211",
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index c3fff70..1d58977 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -4390,7 +4390,7 @@
status = wlan_hdd_validate_context(pHddCtx);
/*bss_update is not allowed during wlan driver loading or unloading*/
- if (pHddCtx->isLoadUnloadInProgress)
+ if (WLAN_HDD_IS_LOAD_UNLOAD_IN_PROGRESS(pHddCtx))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s:Loading_unloading in Progress. Ignore!!!",__func__);
@@ -4594,7 +4594,7 @@
/*bss_update is not allowed during wlan driver loading or unloading*/
- if (pHddCtx->isLoadUnloadInProgress)
+ if (WLAN_HDD_IS_LOAD_UNLOAD_IN_PROGRESS(pHddCtx))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s:Loading_unloading in Progress. Ignore!!!",__func__);
@@ -8632,7 +8632,7 @@
return ret;
}
- if (pHddCtx->isLoadUnloadInProgress)
+ if (WLAN_HDD_IS_LOAD_UNLOAD_IN_PROGRESS(pHddCtx))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: Unloading/Loading in Progress. Ignore!!!", __func__);
@@ -9762,7 +9762,7 @@
return 0;
}
- if (pHddCtx->isLoadUnloadInProgress)
+ if (WLAN_HDD_IS_LOAD_UNLOAD_IN_PROGRESS(pHddCtx))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: Unloading/Loading in Progress. Ignore!!!", __func__);
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 34c930d..02b42c2 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -474,7 +474,7 @@
return -EAGAIN;
}
- if (pHddCtx->isLoadUnloadInProgress)
+ if (WLAN_HDD_IS_LOAD_UNLOAD_IN_PROGRESS(pHddCtx))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: Unloading/Loading in Progress. Ignore!!!", __func__);
@@ -8077,7 +8077,7 @@
pHddCtx->wiphy = wiphy;
hdd_prevent_suspend();
- pHddCtx->isLoadUnloadInProgress = TRUE;
+ pHddCtx->isLoadUnloadInProgress = WLAN_HDD_LOAD_IN_PROGRESS;
vos_set_load_unload_in_progress(VOS_MODULE_ID_VOSS, TRUE);
@@ -8729,7 +8729,7 @@
mutex_init(&pHddCtx->sap_lock);
- pHddCtx->isLoadUnloadInProgress = FALSE;
+ pHddCtx->isLoadUnloadInProgress = WLAN_HDD_NO_LOAD_UNLOAD_IN_PROGRESS;
#ifdef WLAN_OPEN_SOURCE
#ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK
@@ -9096,7 +9096,7 @@
}
}
- pHddCtx->isLoadUnloadInProgress = TRUE;
+ pHddCtx->isLoadUnloadInProgress = WLAN_HDD_UNLOAD_IN_PROGRESS;
vos_set_load_unload_in_progress(VOS_MODULE_ID_VOSS, TRUE);
//Do all the cleanup before deregistering the driver
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 20a9c1f..3a71584 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -365,7 +365,7 @@
* wlan driver is keep on receiving the remain on channel command
* and which is resulting in crash. So not allowing any remain on
* channel requets when Load/Unload is in progress*/
- if (((hdd_context_t*)pAdapter->pHddCtx)->isLoadUnloadInProgress)
+ if (WLAN_HDD_IS_LOAD_UNLOAD_IN_PROGRESS(((hdd_context_t *)pAdapter->pHddCtx)))
{
hddLog( LOGE,
"%s: Wlan Load/Unload is in progress", __func__);
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index 51f5bd1..34d62fc 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -1727,7 +1727,7 @@
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
/*bss deregister is not allowed during wlan driver loading or unloading*/
- if (pHddCtx->isLoadUnloadInProgress)
+ if (WLAN_HDD_IS_LOAD_UNLOAD_IN_PROGRESS(pHddCtx))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s:Loading_unloading in Progress. Ignore!!!",__func__);
diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index dea9a69..4051475 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -3562,10 +3562,10 @@
#endif
}
- if ( pHddCtx->isLoadUnloadInProgress )
+ if (WLAN_HDD_IS_UNLOAD_IN_PROGRESS(pHddCtx))
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
- ("%s Load/Unload is in progress"), __func__ );
+ ("%s Unload is in progress"), __func__ );
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
return;
#else
@@ -3981,7 +3981,7 @@
return 0;
#endif
}
- if(pHddCtx->isLoadUnloadInProgress ||
+ if((WLAN_HDD_IS_UNLOAD_IN_PROGRESS(pHddCtx)) ||
pHddCtx->isLogpInProgress)
{
VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
diff --git a/CORE/VOSS/src/vos_sched.c b/CORE/VOSS/src/vos_sched.c
index 8c4308f..b286cf4 100644
--- a/CORE/VOSS/src/vos_sched.c
+++ b/CORE/VOSS/src/vos_sched.c
@@ -1783,7 +1783,7 @@
/* Release the lock here */
spin_unlock(&gpVosWatchdogContext->wdLock);
- if (pHddCtx->isLoadUnloadInProgress)
+ if (WLAN_HDD_IS_LOAD_UNLOAD_IN_PROGRESS(pHddCtx))
{
VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
"%s: Load/unload in Progress. Ignoring signaling Watchdog",