From: Jouni Malinen <j@w1.fi>
Date: Sun, 3 Nov 2013 17:11:38 +0000 (+0200)
Subject: hostapd: Use start_ctrl_iface() from hostapd_add_iface()
X-Git-Tag: hostap_2_1~644
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4ba031531964df002312d4ad8674b6d03731e0f;p=thirdparty%2Fhostap.git

hostapd: Use start_ctrl_iface() from hostapd_add_iface()

Better share the same function for initializing control interface from
the two possible paths that can add a new interface to hostapd.

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

diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index fec79b340..f99ee0c3d 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -1766,13 +1766,9 @@ int hostapd_add_iface(struct hapd_interfaces *interfaces, char *buf)
 		goto fail;
 	}
 
-	if (hapd_iface->interfaces &&
-	    hapd_iface->interfaces->ctrl_iface_init &&
-	    hapd_iface->interfaces->ctrl_iface_init(hapd_iface->bss[0])) {
-		wpa_printf(MSG_ERROR, "%s: Failed to setup control "
-			   "interface", __func__);
+	if (start_ctrl_iface(hapd_iface) < 0)
 		goto fail;
-	}
+
 	wpa_printf(MSG_INFO, "Add interface '%s'", conf->bss[0]->iface);
 
 	return 0;