From c20cb023e2da43c49ff19a09bbb68f26c6ff7333 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 3 Nov 2013 13:34:35 +0200 Subject: [PATCH] hostapd: Remove hostapd_interface_init2() This was an unnecessary wrapper functions for calling two functions from a single place in the code. It is cleaner to just call those two functions directly. Signed-hostap: Jouni Malinen --- hostapd/main.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/hostapd/main.c b/hostapd/main.c index a9163613f..748f42a08 100644 --- a/hostapd/main.c +++ b/hostapd/main.c @@ -265,16 +265,6 @@ hostapd_interface_init(struct hapd_interfaces *interfaces, } -static int hostapd_interface_init2(struct hostapd_iface *iface) -{ - if (hostapd_driver_init(iface) || - hostapd_setup_interface(iface)) - return -1; - - return 0; -} - - /** * handle_term - SIGINT and SIGTERM handler to terminate hostapd process */ @@ -694,7 +684,8 @@ int main(int argc, char *argv[]) } for (i = 0; i < interfaces.count; i++) { - if (hostapd_interface_init2(interfaces.iface[i]) < 0) + if (hostapd_driver_init(interfaces.iface[i]) || + hostapd_setup_interface(interfaces.iface[i])) goto out; }