WNM: Rename wnm_dissoc_addr

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

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>

diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
index a588ff3c42d95fb8ceeeed8913937f479c805372..015a1948ef9dc9c7fea7562ee9aed95f71112048 100644 (file)
--- a/wpa_supplicant/wnm_sta.c
+++ b/wpa_supplicant/wnm_sta.c
@@ -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_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,
                          ETH_ALEN);
        } else if (wpa_s->valid_links) {
                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);
        } else {
                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) {
@@ -2072,10 +2072,10 @@ bool wnm_is_bss_excluded(struct wpa_supplicant *wpa_s, struct wpa_bss *bss)
         * which we are connected.
         */
        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;
        } 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;
        }
 

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 7888e7ee93cfa93cdcc5f93fb1c4924410617bd1..c34e71c3f28ea805faae70ebf3532acbb3ab4487 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -1309,7 +1309,7 @@ struct wpa_supplicant {
        u8 wnm_mode;
        bool wnm_link_removal;
        bool wnm_disassoc_mld;
-       u8 wnm_dissoc_addr[ETH_ALEN];
+       u8 wnm_disassoc_addr[ETH_ALEN];
        u16 wnm_dissoc_timer;
        u8 wnm_bss_termination_duration[12];
        struct neighbor_report *wnm_neighbor_report_elements;