X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fifenslave.c;h=ae97457264d81dd6446386d2b37fc46512439953;hb=08ea11ab0749a7977e6d47cd0fa7b3c9cc10af32;hp=fed18696792e34836e18e2bd36c4161ec307c8b3;hpb=048897c9712f99555e607c11732ad761e4397c48;p=oweals%2Fbusybox.git

diff --git a/networking/ifenslave.c b/networking/ifenslave.c
index fed186967..ae9745726 100644
--- a/networking/ifenslave.c
+++ b/networking/ifenslave.c
@@ -100,14 +100,19 @@
 
 #include "libbb.h"
 
+/* #include <net/if.h> - no. linux/if_bonding.h pulls in linux/if.h */
 #include <net/if_arp.h>
 #include <linux/if_bonding.h>
 #include <linux/sockios.h>
 
-typedef unsigned long long u64; /* hack, so we may include kernel's ethtool.h */
-typedef uint32_t u32;           /* ditto */
-typedef uint16_t u16;           /* ditto */
-typedef uint8_t u8;             /* ditto */
+#ifndef IFNAMSIZ
+#define IFNAMSIZ 16
+#endif
+
+typedef uint64_t u64; /* hack, so we may include kernel's ethtool.h */
+typedef uint32_t u32; /* ditto */
+typedef uint16_t u16; /* ditto */
+typedef uint8_t u8;   /* ditto */
 #include <linux/ethtool.h>
 
 
@@ -147,7 +152,7 @@ static int ioctl_on_skfd(unsigned request, struct ifreq *ifr)
 
 static int set_ifrname_and_do_ioctl(unsigned request, struct ifreq *ifr, const char *ifname)
 {
-        strncpy_IFNAMSIZ(ifr->ifr_name, ifname);
+	strncpy_IFNAMSIZ(ifr->ifr_name, ifname);
 	return ioctl_on_skfd(request, ifr);
 }
 
@@ -446,7 +451,7 @@ static NOINLINE void get_drv_info(char *master_ifname)
 }
 
 int ifenslave_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int ifenslave_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int ifenslave_main(int argc UNUSED_PARAM, char **argv)
 {
 	char *master_ifname, *slave_ifname;
 	int rv;