Fix continuous scan req failure because of connection in progress
In random case, driver rejects all scan request for longer time saying that
connection in progress. There are two changes covered in this patch to fix
that issue.
1) When disconnect request comes from user space, wlan_hdd_disconnect()
issues disconnect request to SME and waits for the disconnect completion
with 500ms timeout. In some rare cases, whole disconnection process
takes more than 500 ms to complete. On such senario, wlan_hdd_disconnect
posts success to upper layer (immediately after 500ms) even before whole
disconnection process completes. To force wlan_hdd_disconnect() to wait
more time, disconnect timeout value is increased from 500 ms to 2 sec.
2) Also, scan done callback changed to report correct scan status to
cfg80211. Earlier scan result status always informed as success
irrespective of actual scan result. This change mainly for cfg80211
not to post any scan results to user space in scan failure cases.
Change-Id: I651a35532d9594615de2731f992ff1b6aeb2cb0b
CRs-Fixed: 623307
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 0339d25..0ac38c3 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -100,7 +100,7 @@
#define TDLS_INIT_DONE (6)
/** Maximum time(ms)to wait for disconnect to complete **/
-#define WLAN_WAIT_TIME_DISCONNECT 500
+#define WLAN_WAIT_TIME_DISCONNECT 2000
#define WLAN_WAIT_TIME_STATS 800
#define WLAN_WAIT_TIME_POWER 800
#define WLAN_WAIT_TIME_COUNTRY 1000
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 49a2abe..62694e6 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -4813,6 +4813,7 @@
hdd_scaninfo_t *pScanInfo = &pHddCtx->scan_info;
struct cfg80211_scan_request *req = NULL;
int ret = 0;
+ bool aborted = false;
long waitRet = 0;
ENTER();
@@ -4909,7 +4910,11 @@
* cfg80211_scan_done informing NL80211 about completion
* of scanning
*/
- cfg80211_scan_done(req, false);
+ if (status == eCSR_SCAN_ABORT || status == eCSR_SCAN_FAILURE)
+ {
+ aborted = true;
+ }
+ cfg80211_scan_done(req, aborted);
complete(&pScanInfo->abortscan_event_var);
allow_suspend:
@@ -6511,7 +6516,6 @@
int status;
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
- long ret;
status = wlan_hdd_validate_context(pHddCtx);
@@ -6537,18 +6541,25 @@
__func__, (int)status );
return -EINVAL;
}
- ret = wait_for_completion_interruptible_timeout(
+ status = wait_for_completion_interruptible_timeout(
&pAdapter->disconnect_comp_var,
msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT));
- if (ret <= 0)
+ if (!status)
{
hddLog(VOS_TRACE_LEVEL_ERROR,
- FL("wait on disconnect_comp_var failed %ld"), ret);
+ "%s: Failed to disconnect, timed out", __func__);
+ return -ETIMEDOUT;
+ }
+ else if (status == -ERESTARTSYS)
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ "%s: Failed to disconnect, wait interrupted", __func__);
+ return status;
}
/*stop tx queues*/
netif_tx_disable(pAdapter->dev);
netif_carrier_off(pAdapter->dev);
- return status;
+ return 0;
}