Merge wireless_event_{,de}init() into {,de}init() driver op

[wpasupplicant] / hostapd / hostapd.c

diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index f227242..b362ca2 100644 (file)
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -426,8 +426,6 @@ static void hostapd_cleanup(struct hostapd_data *hapd)
 
        hostapd_deinit_wps(hapd);
 
-       hostapd_wireless_event_deinit(hapd);
-
 #ifdef EAP_TLS_FUNCS
        if (hapd->ssl_ctx) {
                tls_deinit(hapd->ssl_ctx);
@@ -1364,10 +1362,6 @@ static int setup_interface(struct hostapd_iface *iface)
                return -1;
        }
 
-       /* TODO: merge with hostapd_driver_init() ? */
-       if (hostapd_wireless_event_init(hapd) < 0)
-               return -1;
-
        if (hostapd_get_hw_features(iface)) {
                /* Not all drivers support this yet, so continue without hw
                 * feature data. */