WNM: Rename wnm_dissoc_timer

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

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
index 015a1948ef9dc9c7fea7562ee9aed95f71112048..51ac2d6b35ebdcb3a06905ce9d2e4e5d9eb61c0c 100644 (file)
--- a/wpa_supplicant/wnm_sta.c
+++ b/wpa_supplicant/wnm_sta.c
@@ -1407,7 +1407,7 @@ static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s,
 
        wpa_s->wnm_dialog_token = pos[0];
        wpa_s->wnm_mode = pos[1];
-       wpa_s->wnm_dissoc_timer = WPA_GET_LE16(pos + 2);
+       wpa_s->wnm_disassoc_timer = WPA_GET_LE16(pos + 2);
        wpa_s->wnm_link_removal = false;
        valid_int = pos[4];
        wpa_s->wnm_reply = reply;
@@ -1416,7 +1416,7 @@ static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s,
                   "dialog_token=%u request_mode=0x%x "
                   "disassoc_timer=%u validity_interval=%u",
                   wpa_s->wnm_dialog_token, wpa_s->wnm_mode,
-                  wpa_s->wnm_dissoc_timer, valid_int);
+                  wpa_s->wnm_disassoc_timer, valid_int);
 
 #if defined(CONFIG_MBO) && defined(CONFIG_TESTING_OPTIONS)
        if (wpa_s->reject_btm_req_reason) {
@@ -1462,7 +1462,8 @@ static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s,
 
                wpa_msg(wpa_s, MSG_INFO, ESS_DISASSOC_IMMINENT "%d %u %s",
                        wpa_sm_pmf_enabled(wpa_s->wpa),
-                       wpa_s->wnm_dissoc_timer * beacon_int * 128 / 125, url);
+                       wpa_s->wnm_disassoc_timer * beacon_int * 128 / 125,
+                       url);
        }
 
        disassoc_imminent = wpa_s->wnm_mode & WNM_BSS_TM_REQ_DISASSOC_IMMINENT;
@@ -1510,8 +1511,8 @@ static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s,
 
        if (disassoc_imminent) {
                wpa_msg(wpa_s, MSG_INFO, "WNM: Disassociation Imminent - "
-                       "Disassociation Timer %u", wpa_s->wnm_dissoc_timer);
-               if (wpa_s->wnm_dissoc_timer && !wpa_s->scanning &&
+                       "Disassociation Timer %u", wpa_s->wnm_disassoc_timer);
+               if (wpa_s->wnm_disassoc_timer && !wpa_s->scanning &&
                    (!wpa_s->current_ssid || !wpa_s->current_ssid->bssid_set)) {
                        wpa_printf(MSG_DEBUG, "Trying to find another BSS");
                        wpa_s->wnm_transition_scan = true;

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index c34e71c3f28ea805faae70ebf3532acbb3ab4487..cbb0688d4c1b2d995e527b3f9ebce9c73b58c7e8 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -1310,7 +1310,7 @@ struct wpa_supplicant {
        bool wnm_link_removal;
        bool wnm_disassoc_mld;
        u8 wnm_disassoc_addr[ETH_ALEN];
-       u16 wnm_dissoc_timer;
+       u16 wnm_disassoc_timer;
        u8 wnm_bss_termination_duration[12];
        struct neighbor_report *wnm_neighbor_report_elements;
        struct os_reltime wnm_cand_valid_until;