From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Tue, 5 Nov 2013 23:38:17 +0000 (+0200)
Subject: Restore hapd->interface_added tracking to core hostapd
X-Git-Tag: hostap_2_1~612
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6023a7880b9837d97d12d7a61f212ec6ddfe1af7;p=thirdparty%2Fhostap.git

Restore hapd->interface_added tracking to core hostapd

This reverts parts of commit 390e489c0d9415caf103367136eaa534b559837c
that tried to enable removal of the first BSS. Since that operation is
now forced to remove all BSSs, these changes are not needed. The
hostapd_if_remove() operation in hostapd_free_hapd_data() is problematic
for the first BSS since it ends up freeing driver wrapper information
that is needed later when deinitializing the driver wrapper.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
---

diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 63f7565b3..14abab902 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -260,7 +260,8 @@ static void hostapd_free_hapd_data(struct hostapd_data *hapd)
 
 	authsrv_deinit(hapd);
 
-	if (hostapd_if_remove(hapd, WPA_IF_AP_BSS, hapd->conf->iface)) {
+	if (hapd->interface_added &&
+	    hostapd_if_remove(hapd, WPA_IF_AP_BSS, hapd->conf->iface)) {
 		wpa_printf(MSG_WARNING, "Failed to remove BSS interface %s",
 			   hapd->conf->iface);
 	}
@@ -649,6 +650,7 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
 			}
 		}
 
+		hapd->interface_added = 1;
 		if (hostapd_if_add(hapd->iface->bss[0], WPA_IF_AP_BSS,
 				   hapd->conf->iface, hapd->own_addr, hapd,
 				   &hapd->drv_priv, force_ifname, if_addr,
diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
index adb3728d7..e39a1fdb9 100644
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
@@ -101,6 +101,7 @@ struct hostapd_data {
 	struct hostapd_iface *iface;
 	struct hostapd_config *iconf;
 	struct hostapd_bss_config *conf;
+	int interface_added; /* virtual interface added for this BSS */
 
 	u8 own_addr[ETH_ALEN];