diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-27 02:08:00 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-27 02:08:00 +0000 |
| commit | a17df60ed32733c4aa777ca6ebf38b53e94fe73b (patch) | |
| tree | 60d8dc48a564bc3bfd925dbaecacd41d2a15a5b5 | |
| parent | e123d4c927669f8713299710d076b94548996011 (diff) | |
| parent | 31f148388fb04d8fb1bcd886409bc4f56ce84538 (diff) | |
| download | wpa_supplicant_8-a17df60ed32733c4aa777ca6ebf38b53e94fe73b.tar.gz | |
Snap for 6338078 from 31f148388fb04d8fb1bcd886409bc4f56ce84538 to rvc-release
Change-Id: I5c466202f38e30132ca46f3a7a69114415530e8d
| -rw-r--r-- | wpa_supplicant/hidl/1.3/hidl_manager.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/wpa_supplicant/hidl/1.3/hidl_manager.cpp b/wpa_supplicant/hidl/1.3/hidl_manager.cpp index a7fd3f50..e467da32 100644 --- a/wpa_supplicant/hidl/1.3/hidl_manager.cpp +++ b/wpa_supplicant/hidl/1.3/hidl_manager.cpp @@ -1691,6 +1691,10 @@ uint32_t getBssTmDataAssocRetryDelayMs(struct wpa_supplicant *wpa_s) else beacon_int = 100; /* best guess */ + if (wpa_s->wnm_mode & WNM_BSS_TM_REQ_DISASSOC_IMMINENT) { + // number of tbtts to milliseconds + duration_ms = wpa_s->wnm_dissoc_timer * beacon_int * 128 / 125; + } if (wpa_s->wnm_mode & WNM_BSS_TM_REQ_BSS_TERMINATION_INCLUDED) { //wnm_bss_termination_duration contains 12 bytes of BSS //termination duration subelement. Format of IE is @@ -1701,17 +1705,13 @@ uint32_t getBssTmDataAssocRetryDelayMs(struct wpa_supplicant *wpa_s) duration_ms = WPA_GET_LE16(wpa_s->wnm_bss_termination_duration + 10); // minutes to milliseconds duration_ms = duration_ms * 60 * 1000; - } else if ((wpa_s->wnm_mode & WNM_BSS_TM_REQ_DISASSOC_IMMINENT) - || (wpa_s->wnm_mode & WNM_BSS_TM_REQ_ESS_DISASSOC_IMMINENT)) { - // number of tbtts to milliseconds - duration_ms = wpa_s->wnm_dissoc_timer * beacon_int * 128 / 125; + } #ifdef CONFIG_MBO - if (wpa_s->wnm_mbo_assoc_retry_delay_present) { - // number of seconds to milliseconds - duration_ms = wpa_s->wnm_mbo_assoc_retry_delay_sec * 1000; - } -#endif + if (wpa_s->wnm_mbo_assoc_retry_delay_present) { + // number of seconds to milliseconds + duration_ms = wpa_s->wnm_mbo_assoc_retry_delay_sec * 1000; } +#endif return duration_ms; } |