From: Jouni Malinen <j@w1.fi>
Date: Sun, 22 May 2016 13:23:28 +0000 (+0300)
Subject: scan: Clean up code a bit - ssid cannot be NULL here
X-Git-Tag: hostap_2_6~469
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1ae2876d5851658feb91d0b3616738722edb05c;p=thirdparty%2Fhostap.git

scan: Clean up code a bit - ssid cannot be NULL here

wpa_s->current_ssid is set to a non-NULL ssid pointer value here, so
there is no need for the extra if statement.

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

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index 8dab4426b..bfee75628 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -36,8 +36,7 @@ static void wpa_supplicant_gen_assoc_event(struct wpa_supplicant *wpa_s)
 
 	if (wpa_s->current_ssid == NULL) {
 		wpa_s->current_ssid = ssid;
-		if (wpa_s->current_ssid != NULL)
-			wpas_notify_network_changed(wpa_s);
+		wpas_notify_network_changed(wpa_s);
 	}
 	wpa_supplicant_initiate_eapol(wpa_s);
 	wpa_dbg(wpa_s, MSG_DEBUG, "Already associated with a configured "