[PATCH] Make networking/libiproute/iplink.c compile with kernel versions prior to 2.6.23

Eugene Rudoy gene.devel at gmail.com
Sun Jan 19 22:35:52 UTC 2014


Without this patch it fails with:

  CC      networking/libiproute/iplink.o
networking/libiproute/iplink.c: In function 'vlan_parse_opt':
networking/libiproute/iplink.c:331:9: error: variable 'flags' has initializer but incomplete type
networking/libiproute/iplink.c:331:25: error: storage size of 'flags' isn't known
networking/libiproute/iplink.c:341:23: error: 'IFLA_VLAN_ID' undeclared (first use in this function)
networking/libiproute/iplink.c:341:23: note: each undeclared identifier is reported only once for each function it appears in
networking/libiproute/iplink.c:383:22: error: 'IFLA_VLAN_FLAGS' undeclared (first use in this function)
networking/libiproute/iplink.c:331:25: warning: unused variable 'flags' [-Wunused-variable]
networking/libiproute/iplink.c: In function 'do_add_or_delete':
networking/libiproute/iplink.c:453:35: error: 'IFLA_INFO_DATA' undeclared (first use in this function)
make[2]: *** [networking/libiproute/iplink.o] Error 1

Signed-off-by: Eugene Rudoy <gene.devel at gmail.com>
---
 networking/libiproute/iplink.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index 286e59e..a6b1100 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -28,9 +28,21 @@
 #undef  IFLA_VLAN_PROTOCOL
 #define IFLA_VLAN_PROTOCOL      5
 
+/* introduced in https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit?id=38f7b870d4a6a5d3ec21557e849620cb7d032965 / v2.6.23 */
 #ifndef IFLA_LINKINFO
 # define IFLA_LINKINFO 18
 # define IFLA_INFO_KIND 1
+# define IFLA_INFO_DATA 2
+#endif
+
+/* introduced in https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit?id=07b5b17e157b7018d0ca40ca0d1581a23096fb45 / v2.6.23 */
+#ifndef IFLA_VLAN_MAX
+#define IFLA_VLAN_ID 1
+#define IFLA_VLAN_FLAGS 2
+struct ifla_vlan_flags {
+	__u32	flags;
+	__u32	mask;
+};
 #endif
 
 /* taken from linux/sockios.h */
-- 
1.8.5.2



More information about the busybox mailing list