aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd/main.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2013-11-03 11:34:35 (GMT)
committerJouni Malinen <j@w1.fi>2013-11-03 17:51:06 (GMT)
commitc20cb023e2da43c49ff19a09bbb68f26c6ff7333 (patch)
tree4f55f8a727e23553495554dece244573f7d313f0 /hostapd/main.c
parent4a5deb9b9d710e2f930edc968ddae59f0abd2d17 (diff)
downloadhostap-c20cb023e2da43c49ff19a09bbb68f26c6ff7333.zip
hostap-c20cb023e2da43c49ff19a09bbb68f26c6ff7333.tar.gz
hostap-c20cb023e2da43c49ff19a09bbb68f26c6ff7333.tar.bz2
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 <j@w1.fi>
Diffstat (limited to 'hostapd/main.c')
-rw-r--r--hostapd/main.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/hostapd/main.c b/hostapd/main.c
index a916361..748f42a 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;
}