UPnP: Removed shadowed variable

[wpasupplicant] / hostapd / driver_wired.c

diff --git a/hostapd/driver_wired.c b/hostapd/driver_wired.c
index 61cb667..0a1d733 100644 (file)
--- a/hostapd/driver_wired.c
+++ b/hostapd/driver_wired.c
@@ -29,7 +29,6 @@
 #endif /* USE_KERNEL_HEADERS */
 
 #include "hostapd.h"
-#include "ieee802_1x.h"
 #include "eloop.h"
 #include "sta_info.h"
 #include "driver.h"
@@ -38,6 +37,7 @@
 
 struct wired_driver_data {
        struct hostapd_data *hapd;
+       char iface[IFNAMSIZ + 1];
 
        int sock; /* raw packet socket for driver access */
        int dhcp_sock; /* socket for dhcp packets */
@@ -118,7 +118,7 @@ static void handle_data(struct hostapd_data *hapd, unsigned char *buf,
                        pos = (u8 *) (hdr + 1);
                        left = len - sizeof(*hdr);
 
-                       ieee802_1x_receive(hapd, sa, pos, left);
+                       hostapd_eapol_receive(hapd, sa, pos, left);
                break;
 
        default:
@@ -197,7 +197,7 @@ static int wired_init_sockets(struct wired_driver_data *drv)
        }
 
        memset(&ifr, 0, sizeof(ifr));
-       os_strlcpy(ifr.ifr_name, hapd->conf->iface, sizeof(ifr.ifr_name));
+       os_strlcpy(ifr.ifr_name, drv->iface, sizeof(ifr.ifr_name));
        if (ioctl(drv->sock, SIOCGIFINDEX, &ifr) != 0) {
                perror("ioctl(SIOCGIFINDEX)");
                return -1;
@@ -229,7 +229,7 @@ static int wired_init_sockets(struct wired_driver_data *drv)
        }
 
        memset(&ifr, 0, sizeof(ifr));
-       os_strlcpy(ifr.ifr_name, hapd->conf->iface, sizeof(ifr.ifr_name));
+       os_strlcpy(ifr.ifr_name, drv->iface, sizeof(ifr.ifr_name));
        if (ioctl(drv->sock, SIOCGIFHWADDR, &ifr) != 0) {
                perror("ioctl(SIOCGIFHWADDR)");
                return -1;
@@ -271,7 +271,7 @@ static int wired_init_sockets(struct wired_driver_data *drv)
        }
 
        memset(&ifr, 0, sizeof(ifr));
-       os_strlcpy(ifr.ifr_ifrn.ifrn_name, hapd->conf->iface, IFNAMSIZ);
+       os_strlcpy(ifr.ifr_ifrn.ifrn_name, drv->iface, IFNAMSIZ);
        if (setsockopt(drv->dhcp_sock, SOL_SOCKET, SO_BINDTODEVICE,
                       (char *) &ifr, sizeof(ifr)) < 0) {
                perror("setsockopt[SOL_SOCKET,SO_BINDTODEVICE]");
@@ -339,6 +339,7 @@ static void * wired_driver_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;
 
        if (wired_init_sockets(drv)) {