diff options
| -rw-r--r-- | core/hdd/inc/wlan_hdd_main.h | 5 | ||||
| -rw-r--r-- | core/mac/src/include/sir_params.h | 3 | ||||
| -rw-r--r-- | core/wma/inc/wma.h | 36 | ||||
| -rw-r--r-- | core/wma/src/wma_scan_roam.c | 2 |
4 files changed, 22 insertions, 24 deletions
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 8e2cd6f5f508..302695b63939 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -266,10 +266,11 @@ #define WLAN_HDD_QOS_ACTION_FRAME 1 #define WLAN_HDD_QOS_MAP_CONFIGURE 4 -#define HDD_SAP_WAKE_LOCK_DURATION 10000 /* in msecs */ +#define HDD_SAP_WAKE_LOCK_DURATION WAKELOCK_DURATION_RECOMMENDED /* SAP client disconnect wake lock duration in milli seconds */ -#define HDD_SAP_CLIENT_DISCONNECT_WAKE_LOCK_DURATION (1000) +#define HDD_SAP_CLIENT_DISCONNECT_WAKE_LOCK_DURATION \ + WAKELOCK_DURATION_RECOMMENDED #if defined(CONFIG_HL_SUPPORT) #define HDD_MOD_EXIT_SSR_MAX_RETRIES 200 diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index f15d773cc67e..d03a1894ff86 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -42,6 +42,9 @@ #include "sir_types.h" +#define WAKELOCK_DURATION_RECOMMENDED 1000 +#define WAKELOCK_DURATION_MAX 3000 + /* defines for WPS config states */ #define SAP_WPS_DISABLED 0 #define SAP_WPS_ENABLED_UNCONFIGURED 1 diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index c95b5ecd9378..78150af8be4f 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -60,7 +60,7 @@ #define WMA_READY_EVENTID_TIMEOUT 6000 #define WMA_SERVICE_READY_EXT_TIMEOUT 6000 #define WMA_TGT_SUSPEND_COMPLETE_TIMEOUT 6000 -#define WMA_WAKE_LOCK_TIMEOUT 1000 +#define WMA_WAKE_LOCK_TIMEOUT WAKELOCK_DURATION_RECOMMENDED #define WMA_RESUME_TIMEOUT 6000 #define MAX_MEM_CHUNKS 32 #define NAN_CLUSTER_ID_BYTES 4 @@ -290,11 +290,11 @@ enum ds_mode { #define WMA_DEL_P2P_SELF_STA_RSP_START 0x03 #define WMA_SET_LINK_PEER_RSP 0x04 #define WMA_DELETE_PEER_RSP 0x05 -#define WMA_VDEV_START_REQUEST_TIMEOUT (6000) /* 6 seconds */ -#define WMA_VDEV_STOP_REQUEST_TIMEOUT (6000) /* 6 seconds */ -#define WMA_VDEV_HW_MODE_REQUEST_TIMEOUT (5000) /* 5 seconds */ -#define WMA_VDEV_PLCY_MGR_CMD_TIMEOUT (3000) /* 3 seconds */ -#define WMA_VDEV_SET_KEY_REQUEST_TIMEOUT (1000) /* 1 second */ +#define WMA_VDEV_START_REQUEST_TIMEOUT WAKELOCK_DURATION_RECOMMENDED +#define WMA_VDEV_STOP_REQUEST_TIMEOUT WAKELOCK_DURATION_RECOMMENDED +#define WMA_VDEV_HW_MODE_REQUEST_TIMEOUT WAKELOCK_DURATION_RECOMMENDED +#define WMA_VDEV_PLCY_MGR_CMD_TIMEOUT WAKELOCK_DURATION_RECOMMENDED +#define WMA_VDEV_SET_KEY_REQUEST_TIMEOUT WAKELOCK_DURATION_RECOMMENDED #define WMA_TGT_INVALID_SNR (0) @@ -344,26 +344,20 @@ enum ds_mode { #define WMA_RSSI_THOLD_DEFAULT -300 #ifdef FEATURE_WLAN_SCAN_PNO -#define WMA_PNO_MATCH_WAKE_LOCK_TIMEOUT (5 * 1000) /* in msec */ -#ifdef CONFIG_SLUB_DEBUG_ON -#define WMA_PNO_SCAN_COMPLETE_WAKE_LOCK_TIMEOUT (2 * 1000) /* in msec */ -#else -#define WMA_PNO_SCAN_COMPLETE_WAKE_LOCK_TIMEOUT (1 * 1000) /* in msec */ -#endif /* CONFIG_SLUB_DEBUG_ON */ +#define WMA_PNO_MATCH_WAKE_LOCK_TIMEOUT WAKELOCK_DURATION_RECOMMENDED +#define WMA_PNO_SCAN_COMPLETE_WAKE_LOCK_TIMEOUT WAKELOCK_DURATION_RECOMMENDED #endif /* FEATURE_WLAN_SCAN_PNO */ -#define WMA_AUTH_REQ_RECV_WAKE_LOCK_TIMEOUT (5 * 1000) /* in msec */ -#define WMA_ASSOC_REQ_RECV_WAKE_LOCK_DURATION (5 * 1000) /* in msec */ -#define WMA_DEAUTH_RECV_WAKE_LOCK_DURATION (5 * 1000) /* in msec */ -#define WMA_DISASSOC_RECV_WAKE_LOCK_DURATION (5 * 1000) /* in msec */ +#define WMA_AUTH_REQ_RECV_WAKE_LOCK_TIMEOUT WAKELOCK_DURATION_RECOMMENDED +#define WMA_ASSOC_REQ_RECV_WAKE_LOCK_DURATION WAKELOCK_DURATION_RECOMMENDED +#define WMA_DEAUTH_RECV_WAKE_LOCK_DURATION WAKELOCK_DURATION_RECOMMENDED +#define WMA_DISASSOC_RECV_WAKE_LOCK_DURATION WAKELOCK_DURATION_RECOMMENDED #define WMA_ROAM_HO_WAKE_LOCK_DURATION (500) /* in msec */ #ifdef FEATURE_WLAN_AUTO_SHUTDOWN -#define WMA_AUTO_SHUTDOWN_WAKE_LOCK_DURATION (5 * 1000) /* in msec */ -#else -#define WMA_AUTO_SHUTDOWN_WAKE_LOCK_DURATION 0 /* in msec */ +#define WMA_AUTO_SHUTDOWN_WAKE_LOCK_DURATION WAKELOCK_DURATION_RECOMMENDED #endif -#define WMA_BMISS_EVENT_WAKE_LOCK_DURATION (4 * 1000) /* in msec */ -#define WMA_FW_RSP_EVENT_WAKE_LOCK_DURATION (3 * 1000) /* in msec */ +#define WMA_BMISS_EVENT_WAKE_LOCK_DURATION WAKELOCK_DURATION_RECOMMENDED +#define WMA_FW_RSP_EVENT_WAKE_LOCK_DURATION WAKELOCK_DURATION_MAX #define WMA_TXMIC_LEN 8 #define WMA_RXMIC_LEN 8 diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 24135b748a14..b627bc1169fe 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -96,7 +96,7 @@ enum extscan_report_events_type { EXTSCAN_REPORT_EVENTS_CONTEXT_HUB = 0x08, }; -#define WMA_EXTSCAN_CYCLE_WAKE_LOCK_DURATION (5 * 1000) /* in msec */ +#define WMA_EXTSCAN_CYCLE_WAKE_LOCK_DURATION WAKELOCK_DURATION_RECOMMENDED /* * Maximum number of entires that could be present in the |