diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 09:51:33 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 09:51:33 +0100 |
commit | 29e2c45a5b317556a890a86ca7780e589072151c (patch) | |
tree | d0da5ef7f8ae5cfcf69e352e05217053bb6f46d3 | |
parent | 83423978014bce3ef4d09022d3eb1a4a32f7ba6d (diff) | |
download | busybox-w32-29e2c45a5b317556a890a86ca7780e589072151c.tar.gz busybox-w32-29e2c45a5b317556a890a86ca7780e589072151c.tar.bz2 busybox-w32-29e2c45a5b317556a890a86ca7780e589072151c.zip |
tc: consolidate its disabled bits
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | include/applets.src.h | 1 | ||||
-rw-r--r-- | networking/Config.src | 10 | ||||
-rw-r--r-- | networking/tc.c | 17 |
3 files changed, 16 insertions, 12 deletions
diff --git a/include/applets.src.h b/include/applets.src.h index 3fd9ba06e..18baee155 100644 --- a/include/applets.src.h +++ b/include/applets.src.h | |||
@@ -206,7 +206,6 @@ IF_SUM(APPLET(sum, BB_DIR_USR_BIN, BB_SUID_DROP)) | |||
206 | IF_SWITCH_ROOT(APPLET(switch_root, BB_DIR_SBIN, BB_SUID_DROP)) | 206 | IF_SWITCH_ROOT(APPLET(switch_root, BB_DIR_SBIN, BB_SUID_DROP)) |
207 | IF_TAC(APPLET_NOEXEC(tac, tac, BB_DIR_USR_BIN, BB_SUID_DROP, tac)) | 207 | IF_TAC(APPLET_NOEXEC(tac, tac, BB_DIR_USR_BIN, BB_SUID_DROP, tac)) |
208 | IF_TAIL(APPLET(tail, BB_DIR_USR_BIN, BB_SUID_DROP)) | 208 | IF_TAIL(APPLET(tail, BB_DIR_USR_BIN, BB_SUID_DROP)) |
209 | /* IF_TC(APPLET(tc, BB_DIR_SBIN, BB_SUID_DROP)) */ | ||
210 | IF_TEE(APPLET(tee, BB_DIR_USR_BIN, BB_SUID_DROP)) | 209 | IF_TEE(APPLET(tee, BB_DIR_USR_BIN, BB_SUID_DROP)) |
211 | IF_TEST(APPLET_NOFORK(test, test, BB_DIR_USR_BIN, BB_SUID_DROP, test)) | 210 | IF_TEST(APPLET_NOFORK(test, test, BB_DIR_USR_BIN, BB_SUID_DROP, test)) |
212 | IF_TR(APPLET(tr, BB_DIR_USR_BIN, BB_SUID_DROP)) | 211 | IF_TR(APPLET(tr, BB_DIR_USR_BIN, BB_SUID_DROP)) |
diff --git a/networking/Config.src b/networking/Config.src index 4d921884f..527bdd15d 100644 --- a/networking/Config.src +++ b/networking/Config.src | |||
@@ -48,16 +48,6 @@ config VERBOSE_RESOLUTION_ERRORS | |||
48 | 48 | ||
49 | INSERT | 49 | INSERT |
50 | 50 | ||
51 | #config TC | ||
52 | # bool "tc" | ||
53 | # default y | ||
54 | # help | ||
55 | # show / manipulate traffic control settings | ||
56 | # | ||
57 | #config FEATURE_TC_INGRESS | ||
58 | # def_bool n | ||
59 | # depends on TC | ||
60 | |||
61 | source networking/udhcp/Config.in | 51 | source networking/udhcp/Config.in |
62 | 52 | ||
63 | config IFUPDOWN_UDHCPC_CMD_OPTIONS | 53 | config IFUPDOWN_UDHCPC_CMD_OPTIONS |
diff --git a/networking/tc.c b/networking/tc.c index e10200c1e..271d569e4 100644 --- a/networking/tc.c +++ b/networking/tc.c | |||
@@ -6,7 +6,22 @@ | |||
6 | * | 6 | * |
7 | * Bernhard Reutner-Fischer adjusted for busybox | 7 | * Bernhard Reutner-Fischer adjusted for busybox |
8 | */ | 8 | */ |
9 | //kbuild:lib-$(CONFIG_TC) += tc.o | 9 | |
10 | /* Was disabled in 2008 by Bernhard, not known why. | ||
11 | --//config:#config TC | ||
12 | --//config:# bool "tc" | ||
13 | --//config:# default y | ||
14 | --//config:# help | ||
15 | --//config:# Show / manipulate traffic control settings | ||
16 | --//config:# | ||
17 | --//config:#config FEATURE_TC_INGRESS | ||
18 | --//config:# default y | ||
19 | --//config:# depends on TC | ||
20 | -- | ||
21 | --//applet:IF_TC(APPLET(tc, BB_DIR_SBIN, BB_SUID_DROP)) | ||
22 | -- | ||
23 | --//kbuild:lib-$(CONFIG_TC) += tc.o | ||
24 | */ | ||
10 | 25 | ||
11 | //usage:#define tc_trivial_usage | 26 | //usage:#define tc_trivial_usage |
12 | /* //usage: "[OPTIONS] OBJECT CMD [dev STRING]" */ | 27 | /* //usage: "[OPTIONS] OBJECT CMD [dev STRING]" */ |