[git commit master 1/1] fix libiproute compile with kernel headers < 2.6.17

Denys Vlasenko vda.linux at googlemail.com
Sat Feb 26 19:11:47 UTC 2011


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

Signed-off-by: Stefan Seyfried <seife+dev at b1-systems.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/libiproute/ipaddress.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 397a8ee..b3748e8 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -162,6 +162,8 @@ static NOINLINE int print_linkinfo(const struct nlmsghdr *n)
 		printf("master %s ", ll_idx_n2a(*(int*)RTA_DATA(tb[IFLA_MASTER]), b1));
 	}
 #endif
+/* IFLA_OPERSTATE was added to kernel with the same commit as IFF_DORMANT */
+#ifdef IFF_DORMANT
 	if (tb[IFLA_OPERSTATE]) {
 		static const char operstate_labels[] ALIGN1 =
 			"UNKNOWN\0""NOTPRESENT\0""DOWN\0""LOWERLAYERDOWN\0"
@@ -169,6 +171,7 @@ static NOINLINE int print_linkinfo(const struct nlmsghdr *n)
 		printf("state %s ", nth_string(operstate_labels,
 					*(uint8_t *)RTA_DATA(tb[IFLA_OPERSTATE])));
 	}
+#endif
 	if (G_filter.showqueue)
 		print_queuelen((char*)RTA_DATA(tb[IFLA_IFNAME]));
 
-- 
1.7.3.4



More information about the busybox-cvs mailing list