hidl/1.3: Change in setting AssocRetryDelay. am: 4cefc52301
Change-Id: Ia4b67d0f49e237802b024ed0e678cf85a6dd674c
diff --git a/wpa_supplicant/hidl/1.3/hidl_manager.cpp b/wpa_supplicant/hidl/1.3/hidl_manager.cpp
index a7fd3f5..e467da3 100644
--- a/wpa_supplicant/hidl/1.3/hidl_manager.cpp
+++ b/wpa_supplicant/hidl/1.3/hidl_manager.cpp
@@ -1691,6 +1691,10 @@
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 @@
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
}
+#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
return duration_ms;
}