From: Benjamin Berg <benjamin.berg@xxxxxxxxx>
Following commits will move more checks into wnm_is_bss_excluded,
prepare for that by changing the logical flow so that further checks can
be inserted.
Signed-off-by: Benjamin Berg <benjamin.berg@xxxxxxxxx>
---
wpa_supplicant/wnm_sta.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
index d3bc03202..7283ff47c 100644
--- a/wpa_supplicant/wnm_sta.c
+++ b/wpa_supplicant/wnm_sta.c
@@ -2056,19 +2056,20 @@ void wnm_clear_coloc_intf_reporting(struct wpa_supplicant *wpa_s)
bool wnm_is_bss_excluded(struct wpa_supplicant *wpa_s, struct wpa_bss *bss)
{
- if (!(wpa_s->wnm_mode & WNM_BSS_TM_REQ_DISASSOC_IMMINENT))
- return false;
-
/*
* In case disassociation imminent is set, do no try to use a BSS to
* which we are connected.
*/
- if (!wpa_s->wnm_disassoc_mld) {
- if (ether_addr_equal(bss->bssid, wpa_s->wnm_disassoc_addr))
- return true;
- } else {
- if (ether_addr_equal(bss->mld_addr, wpa_s->wnm_disassoc_addr))
- return true;
+ if (wpa_s->wnm_mode & WNM_BSS_TM_REQ_DISASSOC_IMMINENT) {
+ if (!wpa_s->wnm_disassoc_mld) {
+ if (ether_addr_equal(bss->bssid,
+ wpa_s->wnm_disassoc_addr))
+ return true;
+ } else {
+ if (ether_addr_equal(bss->mld_addr,
+ wpa_s->wnm_disassoc_addr))
+ return true;
+ }
}
return false;
--
2.44.0
_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap
