Various cleanups I made while going through Erik Hovland's patch submissions,

[oweals/busybox.git] / networking / udhcp / socket.c

diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index 0368851755f361f1337ddf20c473d95fba242568..6417267ec37130f973466d234033ad071d180d96 100644 (file)
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -32,7 +32,7 @@
 #include <net/if.h>
 #include <errno.h>
 #include <features.h>
-#if __GLIBC__ >=2 && __GLIBC_MINOR >= 1
+#if (__GLIBC__ >= 2 && __GLIBC_MINOR >= 1) || defined _NEWLIB_VERSION
 #include <netpacket/packet.h>
 #include <net/ethernet.h>
 #else
@@ -41,8 +41,8 @@
 #include <linux/if_ether.h>
 #endif
 
-#include "socket.h"
 #include "common.h"
+#include "socket.h"
 
 int read_interface(char *interface, int *ifindex, uint32_t *addr, uint8_t *arp)
 {
@@ -120,7 +120,7 @@ int listen_socket(uint32_t ip, int port, char *inf)
                return -1;
        }
 
-       strncpy(interface.ifr_ifrn.ifrn_name, inf, IFNAMSIZ);
+       strncpy(interface.ifr_name, inf, IFNAMSIZ);
        if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE,(char *)&interface, sizeof(interface)) < 0) {
                close(fd);
                return -1;