diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2017-10-03 22:16:38 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-10-03 22:16:38 -0700 |
| commit | eaa2cc17fe42a25db1383da482fbc00db2023461 (patch) | |
| tree | 28a5483e7b294cb8a14147a5b529f398ab1b5c80 | |
| parent | bec878ee82ef7fc83b3a8aa15759fe0859c0496b (diff) | |
| parent | c46f2d20cc8532bac3e55d33b997e431402165a3 (diff) | |
Merge "qcacld-3.0: Close small interface idle race window" into wlan-cld3.driver.lnx.1.1
| -rw-r--r-- | core/hdd/src/wlan_hdd_driver_ops.c | 3 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_main.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 3a61a4a7c3d4..03ad98ce02b0 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -1290,8 +1290,9 @@ static void wlan_hdd_purge_notifier(void) return; } - mutex_lock(&hdd_ctx->iface_change_lock); qdf_cancel_delayed_work(&hdd_ctx->iface_idle_work); + + mutex_lock(&hdd_ctx->iface_change_lock); cds_shutdown_notifier_call(); cds_shutdown_notifier_purge(); mutex_unlock(&hdd_ctx->iface_change_lock); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 639e1de5cdb1..8ff0ca7ba37d 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -2047,11 +2047,11 @@ int hdd_wlan_start_modules(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, return -EINVAL; } + qdf_cancel_delayed_work(&hdd_ctx->iface_idle_work); + mutex_lock(&hdd_ctx->iface_change_lock); hdd_ctx->start_modules_in_progress = true; - qdf_cancel_delayed_work(&hdd_ctx->iface_idle_work); - switch (hdd_ctx->driver_status) { case DRIVER_MODULES_UNINITIALIZED: hdd_info("Wlan transition (UNINITIALIZED -> CLOSED)"); |