Decouple btm_offload feature from MBO feature
btm_offload feature is not tied to MBO feature. So
if btm_offload feature is enabled, skip the roaming
algorithm even if there are no MBO IEs in BTM frame.
Bug: 190231636
Test: Manual - Roaming test
Change-Id: Ib6e76ca11e93f0fff74ed5bd836346b1e1446a5f
diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
index 1b6c1b4..155e8f4 100644
--- a/wpa_supplicant/wnm_sta.c
+++ b/wpa_supplicant/wnm_sta.c
@@ -1465,17 +1465,15 @@
vendor = get_ie(pos, end - pos, WLAN_EID_VENDOR_SPECIFIC);
if (vendor) {
wpas_mbo_ie_trans_req(wpa_s, vendor + 2, vendor[1]);
- if (wpa_s->conf->btm_offload) {
- wpa_msg(wpa_s, MSG_INFO,
- "WNM: Notify BSS Transition Management Request frame status");
- wpa_s->bss_tm_status = WNM_BSS_TM_ACCEPT;
- wpas_notify_bss_tm_status(wpa_s);
- /* since it could be referenced in the scan result logic, initialize it */
- wpa_s->wnm_mbo_trans_reason_present = 0;
- return;
- }
}
#endif /* CONFIG_MBO */
+ if (wpa_s->conf->btm_offload) {
+ wpa_printf(MSG_INFO,
+ "WNM: BTM offload enabled. Notify status and return");
+ wpa_s->bss_tm_status = WNM_BSS_TM_ACCEPT;
+ wpas_notify_bss_tm_status(wpa_s);
+ return;
+ }
if (wpa_s->wnm_mode & WNM_BSS_TM_REQ_DISASSOC_IMMINENT) {
wpa_msg(wpa_s, MSG_INFO, "WNM: Disassociation Imminent - "