A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Avoid waiting if driver is not in connecting stage

Browse source 
qcacld-2.0 to qcacld-3.0 propagation

If disconnect is already in progress because of deauth received
from AP when disconnect is also received from supplicant, there
is a possibility that completion variable disconnect_comp_var
gets reset in hdd_DisConnectHandler because of disconnection
in progress from AP before completion variable disconnect_comp_var
gets initialized in wlan_hdd_disconnect to handle disconnect from
supplicant. This can cause a delay of 5 seconds eventhough disconnect
was already happened. This waiting is not required when previous
connection status was not eConnectionState_Connecting. Fix this delay
by adding a check to avoid waiting when previous connection status was
not eConnectionState_Connecting.

Change-Id: I58ac638622c5164fa1e9fe45c52ebf60fab2340f
CRs-Fixed: 1093562
This commit is contained in:
Padma, Santhosh Kumar 2017-01-05 12:14:08 +05:30 • committed by qcabuildsw
commit 52456c6044
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/hdd/src/wlan_hdd_cfg80211.c
View file

@ -14115,6 +14115,7 @@ static int wlan_hdd_disconnect(hdd_adapter_t *pAdapter, u16 reason)
unsigned long rc;
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
eConnectionState prev_conn_state;
ENTER();
@ -14123,6 +14124,8 @@ static int wlan_hdd_disconnect(hdd_adapter_t *pAdapter, u16 reason)
if (0 != status)
return status;
prev_conn_state = pHddStaCtx->conn_info.connState;
/*stop tx queues */
hdd_notice("Disabling queues");
wlan_hdd_netif_queue_control(pAdapter, WLAN_NETIF_TX_DISABLE_N_CARRIER,
@ -14135,13 +14138,18 @@ static int wlan_hdd_disconnect(hdd_adapter_t *pAdapter, u16 reason)
status = sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(pAdapter),
pAdapter->sessionId, reason);
/*
* Wait here instead of returning directly, this will block the next
* connect command and allow processing of the scan for ssid and
* the previous connect command in CSR. Else we might hit some
* race conditions leading to SME and HDD out of sync.
*/
if (QDF_STATUS_CMD_NOT_QUEUED == status) {
if ((QDF_STATUS_CMD_NOT_QUEUED == status) &&
prev_conn_state != eConnectionState_Connecting) {
hdd_notice("status = %d, already disconnected", status);
result = 0;
goto disconnected;
} else if (QDF_STATUS_CMD_NOT_QUEUED == status) {
/*
* Wait here instead of returning directly, this will block the
* next connect command and allow processing of the scan for
* ssid and the previous connect command in CSR. Else we might
* hit some race conditions leading to SME and HDD out of sync.
*/
hdd_info("Already disconnected or connect was in sme/roam pending list and removed by disconnect");
} else if (0 != status) {
hdd_err("csr_roam_disconnect failure, returned %d",