| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 08:51:33 (GMT) |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 08:51:33 (GMT) |
| commit | 29e2c45a5b317556a890a86ca7780e589072151c (patch) | |
| tree | d0da5ef7f8ae5cfcf69e352e05217053bb6f46d3 | |
| parent | 83423978014bce3ef4d09022d3eb1a4a32f7ba6d (diff) | |
| download | busybox-29e2c45a5b317556a890a86ca7780e589072151c.zip busybox-29e2c45a5b317556a890a86ca7780e589072151c.tar.gz busybox-29e2c45a5b317556a890a86ca7780e589072151c.tar.bz2 | |
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 3fd9ba0..18baee1 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)) IF_SWITCH_ROOT(APPLET(switch_root, BB_DIR_SBIN, BB_SUID_DROP)) IF_TAC(APPLET_NOEXEC(tac, tac, BB_DIR_USR_BIN, BB_SUID_DROP, tac)) IF_TAIL(APPLET(tail, BB_DIR_USR_BIN, BB_SUID_DROP)) -/* IF_TC(APPLET(tc, BB_DIR_SBIN, BB_SUID_DROP)) */ IF_TEE(APPLET(tee, BB_DIR_USR_BIN, BB_SUID_DROP)) IF_TEST(APPLET_NOFORK(test, test, BB_DIR_USR_BIN, BB_SUID_DROP, test)) IF_TR(APPLET(tr, BB_DIR_USR_BIN, BB_SUID_DROP)) diff --git a/networking/Config.src b/networking/Config.src index 4d92188..527bdd1 100644 --- a/networking/Config.src +++ b/networking/Config.src @@ -48,16 +48,6 @@ config VERBOSE_RESOLUTION_ERRORS INSERT -#config TC -# bool "tc" -# default y -# help -# show / manipulate traffic control settings -# -#config FEATURE_TC_INGRESS -# def_bool n -# depends on TC - source networking/udhcp/Config.in config IFUPDOWN_UDHCPC_CMD_OPTIONS diff --git a/networking/tc.c b/networking/tc.c index e10200c..271d569 100644 --- a/networking/tc.c +++ b/networking/tc.c @@ -6,7 +6,22 @@ * * Bernhard Reutner-Fischer adjusted for busybox */ -//kbuild:lib-$(CONFIG_TC) += tc.o + +/* Was disabled in 2008 by Bernhard, not known why. +--//config:#config TC +--//config:# bool "tc" +--//config:# default y +--//config:# help +--//config:# Show / manipulate traffic control settings +--//config:# +--//config:#config FEATURE_TC_INGRESS +--//config:# default y +--//config:# depends on TC +-- +--//applet:IF_TC(APPLET(tc, BB_DIR_SBIN, BB_SUID_DROP)) +-- +--//kbuild:lib-$(CONFIG_TC) += tc.o +*/ //usage:#define tc_trivial_usage /* //usage: "[OPTIONS] OBJECT CMD [dev STRING]" */ |