diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-15 00:02:30 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-15 00:02:30 +0000 |
commit | 44b2ea786ea5acd92af3159b79a54f7f5e58e2aa (patch) | |
tree | b963999fc54eddb65f1929b894f868e24851fc9c /networking | |
parent | 728534b3cb24d568f6770d54390186c74f180206 (diff) | |
download | busybox-w32-44b2ea786ea5acd92af3159b79a54f7f5e58e2aa.tar.gz busybox-w32-44b2ea786ea5acd92af3159b79a54f7f5e58e2aa.tar.bz2 busybox-w32-44b2ea786ea5acd92af3159b79a54f7f5e58e2aa.zip |
back out last change - need to make busybox-1_3-stable branch first
Diffstat (limited to 'networking')
-rw-r--r-- | networking/libiproute/iproute.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c index 30d455602..9c3b87040 100644 --- a/networking/libiproute/iproute.c +++ b/networking/libiproute/iproute.c | |||
@@ -353,14 +353,6 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv) | |||
353 | invarg(*argv, "protocol"); | 353 | invarg(*argv, "protocol"); |
354 | req.r.rtm_protocol = prot; | 354 | req.r.rtm_protocol = prot; |
355 | proto_ok =1; | 355 | proto_ok =1; |
356 | #if ENABLE_FEATURE_IP_RULE | ||
357 | } else if (matches(*argv, "table") == 0) { | ||
358 | uint32_t tid; | ||
359 | NEXT_ARG(); | ||
360 | if (rtnl_rttable_a2n(&tid, *argv)) | ||
361 | invarg(*argv, "table"); | ||
362 | req.r.rtm_table = tid; | ||
363 | #endif | ||
364 | } else if (strcmp(*argv, "dev") == 0 || | 356 | } else if (strcmp(*argv, "dev") == 0 || |
365 | strcmp(*argv, "oif") == 0) { | 357 | strcmp(*argv, "oif") == 0) { |
366 | NEXT_ARG(); | 358 | NEXT_ARG(); |
@@ -548,13 +540,9 @@ static int iproute_list_or_flush(int argc, char **argv, int flush) | |||
548 | NEXT_ARG(); | 540 | NEXT_ARG(); |
549 | if (matches(*argv, "cache") == 0) { | 541 | if (matches(*argv, "cache") == 0) { |
550 | filter.tb = -1; | 542 | filter.tb = -1; |
551 | #if 0 && ENABLE_FEATURE_IP_RULE | ||
552 | |||
553 | #else | ||
554 | } else if (matches(*argv, "main") != 0) { | 543 | } else if (matches(*argv, "main") != 0) { |
555 | invarg(*argv, "table"); | 544 | invarg(*argv, "table"); |
556 | } | 545 | } |
557 | #endif | ||
558 | } else if (matches(*argv, "cache") == 0) { | 546 | } else if (matches(*argv, "cache") == 0) { |
559 | filter.tb = -1; | 547 | filter.tb = -1; |
560 | } else { | 548 | } else { |