[git commit master] ifenslave: fix for 2.4 kernels compile

Denys Vlasenko vda.linux at googlemail.com
Wed Sep 23 21:47:52 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=ecb179b6d72c58acbdbc707538d7562bc1c0a880
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/ifenslave.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/networking/ifenslave.c b/networking/ifenslave.c
index 2180007..28f0c0b 100644
--- a/networking/ifenslave.c
+++ b/networking/ifenslave.c
@@ -101,13 +101,15 @@
 #include "libbb.h"
 
 /* #include <net/if.h> - no. linux/if_bonding.h pulls in linux/if.h */
+#include <linux/if.h>
 #include <net/if_arp.h>
 #include <linux/if_bonding.h>
 #include <linux/sockios.h>
-
 #include "fix_u32.h" /* hack, so we may include kernel's ethtool.h */
 #include <linux/ethtool.h>
-
+#ifndef BOND_ABI_VERSION
+# define BOND_ABI_VERSION 2
+#endif
 #ifndef IFNAMSIZ
 # define IFNAMSIZ 16
 #endif
-- 
1.6.3.3



More information about the busybox-cvs mailing list