On Wednesday 23 September 2009 01:03, Matthew Stoltenberg wrote: > I've had this patch sitting around a couple of weeks. Got around to > cleaning it up a bit and submitting it. > > The attached patch allows me to build the ifenslave applet in > MontaVista CGE31 (xscale_be target) using gcc-3.3.1. I've also tested > the modified applet quite a bit. > > Let me know if you have any suggestions.
FEATURE_2_4_MODULES is about supporting module loading, not a generic "support 2.4 kernel" switch. Looking at the patch, just adding #include <linux/if.h> should work for both 2.4 and 2.6? This work for me on 2.6 system: --- busybox.1/networking/ifenslave.c 2009-09-21 01:21:29.000000000 +0200 +++ busybox.2/networking/ifenslave.c 2009-09-23 23:46:23.000000000 +0200 @@ -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 Does it work on 2.4? -- vda _______________________________________________ busybox mailing list [email protected] http://lists.busybox.net/mailman/listinfo/busybox
