Remove reassociated_connection variable

This was used to select between "(auth)" and "(reauth)" in
CTRL-EVENT-CONNECTED events. However, the variable was not cleared
anywhere else apart from the AP deinit case. As such, it did not really
provide correct information and is not really of much use even with
proper clearing added. As such, it is cleaner to just get rid of this
altogether.

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

diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index 3708bcc9fbebe6eafc4be6f97ec1f006adba9453..c1e4acf5b8bd0e94013188a13df32e46478813e9 100644 (file)
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -603,7 +603,6 @@ void wpa_supplicant_ap_deinit(struct wpa_supplicant *wpa_s)
 
        wpa_s->current_ssid = NULL;
        wpa_s->assoc_freq = 0;
-       wpa_s->reassociated_connection = 0;
 #ifdef CONFIG_P2P
        if (wpa_s->ap_iface->bss)
                wpa_s->ap_iface->bss[0]->p2p_group = NULL;

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index d76f958e362fa4f2ef805bb5fe9781af61d5f229..0fb4d0fd4705e2fdcde31f29e0efb8da9229000f 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -658,16 +658,14 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
 #if defined(CONFIG_CTRL_IFACE) || !defined(CONFIG_NO_STDOUT_DEBUG)
                struct wpa_ssid *ssid = wpa_s->current_ssid;
                wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_CONNECTED "- Connection to "
-                       MACSTR " completed %s [id=%d id_str=%s]",
-                       MAC2STR(wpa_s->bssid), wpa_s->reassociated_connection ?
-                       "(reauth)" : "(auth)",
+                       MACSTR " completed [id=%d id_str=%s]",
+                       MAC2STR(wpa_s->bssid),
                        ssid ? ssid->id : -1,
                        ssid && ssid->id_str ? ssid->id_str : "");
 #endif /* CONFIG_CTRL_IFACE || !CONFIG_NO_STDOUT_DEBUG */
                wpas_clear_temp_disabled(wpa_s, ssid, 1);
                wpa_s->extra_blacklist_count = 0;
                wpa_s->new_connection = 0;
-               wpa_s->reassociated_connection = 1;
                wpa_drv_set_operstate(wpa_s, 1);
 #ifndef IEEE8021X_EAPOL
                wpa_drv_set_supp_port(wpa_s, 1);

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 1897993ae6dd5614296b8926b6d18d0230f1db61..544977b470e954e1c39342f4ac6e0c666b93676d 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -384,7 +384,6 @@ struct wpa_supplicant {
        int scanning;
        int sched_scanning;
        int new_connection;
-       int reassociated_connection;
 
        int eapol_received; /* number of EAPOL packets received after the
                             * previous association event */