WNM: Swap logic in wnm_is_bss_excluded() to allow more checks
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@intel.com>
This commit is contained in:
parent
582b5eff40
commit
a832312806
1 changed files with 10 additions and 9 deletions
|
@ -2057,20 +2057,21 @@ 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)
|
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
|
* In case disassociation imminent is set, do no try to use a BSS to
|
||||||
* which we are connected.
|
* which we are connected.
|
||||||
*/
|
*/
|
||||||
|
if (wpa_s->wnm_mode & WNM_BSS_TM_REQ_DISASSOC_IMMINENT) {
|
||||||
if (!wpa_s->wnm_disassoc_mld) {
|
if (!wpa_s->wnm_disassoc_mld) {
|
||||||
if (ether_addr_equal(bss->bssid, wpa_s->wnm_disassoc_addr))
|
if (ether_addr_equal(bss->bssid,
|
||||||
|
wpa_s->wnm_disassoc_addr))
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
if (ether_addr_equal(bss->mld_addr, wpa_s->wnm_disassoc_addr))
|
if (ether_addr_equal(bss->mld_addr,
|
||||||
|
wpa_s->wnm_disassoc_addr))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue