DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

WNM: Rename wnm_dissoc_addr

Browse source 
Use "disassoc" instead of "dissoc" when referring to disassociation.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
This commit is contained in:
Benjamin Berg 2024-04-29 13:51:43 +02:00 committed by Jouni Malinen
parent 93eb3b83c6
commit ebd18f1ade
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wpa_supplicant/wnm_sta.c
View file

@ -1496,16 +1496,16 @@ static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s,
*/ */
wpa_s->wnm_link_removal = true; wpa_s->wnm_link_removal = true;
wpa_s->wnm_disassoc_mld = false; wpa_s->wnm_disassoc_mld = false;
os_memcpy(wpa_s->wnm_dissoc_addr, os_memcpy(wpa_s->wnm_disassoc_addr,
wpa_s->links[wpa_s->mlo_assoc_link_id].bssid, wpa_s->links[wpa_s->mlo_assoc_link_id].bssid,
ETH_ALEN); ETH_ALEN);
} else if (wpa_s->valid_links) { } else if (wpa_s->valid_links) {
wpa_s->wnm_disassoc_mld = true; wpa_s->wnm_disassoc_mld = true;
os_memcpy(wpa_s->wnm_dissoc_addr, wpa_s->ap_mld_addr, os_memcpy(wpa_s->wnm_disassoc_addr, wpa_s->ap_mld_addr,
ETH_ALEN); ETH_ALEN);
} else { } else {
wpa_s->wnm_disassoc_mld = false; wpa_s->wnm_disassoc_mld = false;
os_memcpy(wpa_s->wnm_dissoc_addr, wpa_s->bssid, ETH_ALEN); os_memcpy(wpa_s->wnm_disassoc_addr, wpa_s->bssid, ETH_ALEN);
} }
if (disassoc_imminent) { if (disassoc_imminent) {
@ -2072,10 +2072,10 @@ bool wnm_is_bss_excluded(struct wpa_supplicant *wpa_s, struct wpa_bss *bss)
* which we are connected. * which we are connected.
*/ */
if (!wpa_s->wnm_disassoc_mld) { if (!wpa_s->wnm_disassoc_mld) {
if (ether_addr_equal(bss->bssid, wpa_s->wnm_dissoc_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_dissoc_addr)) if (ether_addr_equal(bss->mld_addr, wpa_s->wnm_disassoc_addr))
return true; return true;
} }

2
wpa_supplicant/wpa_supplicant_i.h
View file

@ -1309,7 +1309,7 @@ struct wpa_supplicant {
u8 wnm_mode; u8 wnm_mode;
bool wnm_link_removal; bool wnm_link_removal;
bool wnm_disassoc_mld; bool wnm_disassoc_mld;
u8 wnm_dissoc_addr[ETH_ALEN]; u8 wnm_disassoc_addr[ETH_ALEN];
u16 wnm_dissoc_timer; u16 wnm_dissoc_timer;
u8 wnm_bss_termination_duration[12]; u8 wnm_bss_termination_duration[12];
struct neighbor_report *wnm_neighbor_report_elements; struct neighbor_report *wnm_neighbor_report_elements;