From fd265b2213b8be0490d7da7eca320d485957d8c8 Mon Sep 17 00:00:00 2001 From: Yeshwanth Sriram Guntuka Date: Fri, 4 Jan 2019 15:17:53 +0530 Subject: [PATCH] qcacld-3.0: Remove slub debug factor for WMA timeouts In the scenario where vdev response is not received for SAP start, HDD timer of 10secs expires ahead of vdev response timer, which is of 12secs due to slub debug factor. This can result in change interface to be triggered by supplicant before fw down indication is received. Vdev is logically deleted and peer removal in objmgr fails due to vdev get_ref failure resulting in peer leak on wlan shutdown. Fix is to remove slub debug factor for vdev response timeouts. Change-Id: Id0741226ccaebbabb817853246c7b116bd447128 CRs-Fixed: 2376610 --- core/wma/inc/wma.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 80ed4604e3a1..27a99ceadc8e 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -202,18 +202,12 @@ #define WMA_PDEV_SET_HW_MODE_RESP 0x06 #define WMA_PDEV_MAC_CFG_RESP 0x07 -#ifdef CONFIG_SLUB_DEBUG_ON -#define SLUB_DEBUG_FACTOR (2) -#else -#define SLUB_DEBUG_FACTOR (1) -#endif - /* FW response timeout values in milli seconds */ -#define WMA_VDEV_START_REQUEST_TIMEOUT (6000) * (SLUB_DEBUG_FACTOR) -#define WMA_VDEV_STOP_REQUEST_TIMEOUT (6000) * (SLUB_DEBUG_FACTOR) -#define WMA_VDEV_HW_MODE_REQUEST_TIMEOUT (6000) * (SLUB_DEBUG_FACTOR) -#define WMA_VDEV_PLCY_MGR_CMD_TIMEOUT (6000) * (SLUB_DEBUG_FACTOR) -#define WMA_VDEV_DUAL_MAC_CFG_TIMEOUT (5000) * (SLUB_DEBUG_FACTOR) +#define WMA_VDEV_START_REQUEST_TIMEOUT (6000) +#define WMA_VDEV_STOP_REQUEST_TIMEOUT (6000) +#define WMA_VDEV_HW_MODE_REQUEST_TIMEOUT (6000) +#define WMA_VDEV_PLCY_MGR_CMD_TIMEOUT (6000) +#define WMA_VDEV_DUAL_MAC_CFG_TIMEOUT (5000) #define WMA_VDEV_SET_KEY_WAKELOCK_TIMEOUT WAKELOCK_DURATION_RECOMMENDED