Merge hostapd driver init functions into one

[wpasupplicant] / src / drivers / driver_wired.c

diff --git a/src/drivers/driver_wired.c b/src/drivers/driver_wired.c
index 200a2b3..be8cc8f 100644 (file)
--- a/src/drivers/driver_wired.c
+++ b/src/drivers/driver_wired.c
@@ -31,7 +31,6 @@
 #ifdef HOSTAPD
 #include "eloop.h"
 #include "../../hostapd/hostapd.h"
-#include "../../hostapd/config.h"
 #include "../../hostapd/sta_info.h"
 #include "../../hostapd/accounting.h"
 #endif /* HOSTAPD */
@@ -336,7 +335,8 @@ static int wired_send_eapol(void *priv, const u8 *addr,
 }
 
 
-static void * wired_driver_hapd_init(struct hostapd_data *hapd)
+static void * wired_driver_hapd_init(struct hostapd_data *hapd,
+                                    struct wpa_init_params *params)
 {
        struct wpa_driver_wired_data *drv;
 
@@ -347,8 +347,8 @@ static void * wired_driver_hapd_init(struct hostapd_data *hapd)
        }
 
        drv->hapd = hapd;
-       os_strlcpy(drv->iface, hapd->conf->iface, sizeof(drv->iface));
-       drv->use_pae_group_addr = hapd->conf->use_pae_group_addr;
+       os_strlcpy(drv->iface, params->ifname, sizeof(drv->iface));
+       drv->use_pae_group_addr = params->use_pae_group_addr;
 
        if (wired_init_sockets(drv)) {
                free(drv);