From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Sat, 6 Sep 2008 14:52:28 +0000 (-0000)
Subject: ifenslave: on uclibc at least, net/if.h + linux/if_bonding.h dont coexist
X-Git-Tag: 1_13_0~200
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ee9deb863e089e1b607cc5771123257c3223bea0;p=oweals%2Fbusybox.git

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

diff --git a/networking/ifenslave.c b/networking/ifenslave.c
index 89a3f9e80..ae9745726 100644
--- a/networking/ifenslave.c
+++ b/networking/ifenslave.c
@@ -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 */