From 7bf72b44c523bb70c41f9ddc399b59ce23ebe728 Mon Sep 17 00:00:00 2001 From: Jiachao Wu Date: Thu, 22 Mar 2018 19:15:10 +0800 Subject: [PATCH] qcacld-3.0: Increase hdd disconnect wait time wlan_hdd_disconnect wait time is 5 second. WMA_VDEV_STOP_REQUEST_TIMEOUT is 6 second.There have 1 sec gap. Which means if timeout happend, wlan_hdd_disconnect will exit before wma_vdev_resp_timer is invoked. wma_vdev_resp_timer will trigger SME to invoke callback hdd_dis_connect_handler to release vdev obj ref count. If unload driver during the time gap, vdev cannot destory successfully because hdd_dis_connect_handler haven't be called. rmmod will wait for wlan_hdd_disconnect exiting then unload driver. So increase hdd disconnect wait time. Make sure wlan_hdd_disconnect exit after lower layer timeout and hdd disconnect handler be called. Change-Id: I8fddae200ed675b93c0f300a9e28dbbfd3a976a6 CRs-Fixed: 2201448 --- core/hdd/inc/wlan_hdd_main.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 1a31ad0d24..c794c031f0 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -158,10 +158,13 @@ #define ACS_IN_PROGRESS (0) /** Maximum time(ms)to wait for disconnect to complete **/ +/* This value should be larger than the timeout used by WMA to wait for + * stop vdev response from FW + */ #ifdef QCA_WIFI_3_0_EMU -#define WLAN_WAIT_TIME_DISCONNECT 5000 +#define WLAN_WAIT_TIME_DISCONNECT 7000 #else -#define WLAN_WAIT_TIME_DISCONNECT 5000 +#define WLAN_WAIT_TIME_DISCONNECT 7000 #endif #define WLAN_WAIT_DISCONNECT_ALREADY_IN_PROGRESS 1000 #define WLAN_WAIT_TIME_STOP_ROAM 4000