svn commit: trunk/busybox/networking

[vda at busybox.net]

Author: vda
Date: 2008-09-06 07:52:28 -0700 (Sat, 06 Sep 2008)
New Revision: 23336

Log:
ifenslave: on uclibc at least, net/if.h + linux/if_bonding.h dont coexist



Modified:
   trunk/busybox/networking/ifenslave.c


Changeset:
Modified: trunk/busybox/networking/ifenslave.c
===================================================================
--- trunk/busybox/networking/ifenslave.c	2008-09-06 14:42:27 UTC (rev 23335)
+++ trunk/busybox/networking/ifenslave.c	2008-09-06 14:52:28 UTC (rev 23336)
@@ -100,11 +100,15 @@
 
 #include "libbb.h"
 
-#include <net/if.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>
 
+#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 */