diff options
| author | Dustin Brown <dustinb@codeaurora.org> | 2017-10-16 13:03:10 -0700 |
|---|---|---|
| committer | snandini <snandini@codeaurora.org> | 2017-10-16 17:43:55 -0700 |
| commit | 253d88f80dcd2580fd571b97d49a2a1fe5e70db8 (patch) | |
| tree | 3dcf5b7d936450e4c97addc80a3815e243a6a867 | |
| parent | e531ec678cf95abe3afa98a3a208a5c9cb931a63 (diff) | |
qcacld-3.0: Restore previous firmware response timeout values
A previous update to wakelock timeout values incorrectly modified a few
firmware response timeout values. Restore these timeouts to their
original values.
Change-Id: I4ca4c629f0810f6fdb575c5c78904811920defeb
CRs-Fixed: 2127564
| -rw-r--r-- | core/wma/inc/wma.h | 10 | ||||
| -rw-r--r-- | core/wma/src/wma_mgmt.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 78150af8be4f..5ae734c48284 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -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 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_VDEV_START_REQUEST_TIMEOUT 6000 /* 6s */ +#define WMA_VDEV_STOP_REQUEST_TIMEOUT 6000 /* 6s */ +#define WMA_VDEV_HW_MODE_REQUEST_TIMEOUT 5000 /* 5s */ +#define WMA_VDEV_PLCY_MGR_CMD_TIMEOUT 3000 /* 3s */ +#define WMA_VDEV_SET_KEY_WAKELOCK_TIMEOUT WAKELOCK_DURATION_RECOMMENDED #define WMA_TGT_INVALID_SNR (0) diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 4252e4dc4b1d..17d0f7035957 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -1235,9 +1235,9 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma, ) { cmd->peer_flags |= WMI_PEER_NEED_PTK_4_WAY; WMA_LOGD("Acquire set key wake lock for %d ms", - WMA_VDEV_SET_KEY_REQUEST_TIMEOUT); + WMA_VDEV_SET_KEY_WAKELOCK_TIMEOUT); wma_acquire_wakelock(&intr->vdev_set_key_wakelock, - WMA_VDEV_SET_KEY_REQUEST_TIMEOUT); + WMA_VDEV_SET_KEY_WAKELOCK_TIMEOUT); } if (params->wpa_rsn >> 1) cmd->peer_flags |= WMI_PEER_NEED_GTK_2_WAY; |