From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 23 Nov 2016 08:51:33 +0000 (+0100)
Subject: tc: consolidate its disabled bits
X-Git-Tag: 1_26_0~50
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=29e2c45a5b317556a890a86ca7780e589072151c;p=oweals%2Fbusybox.git

tc: consolidate its disabled bits

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

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))
 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 4d921884f..527bdd15d 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 e10200c1e..271d569e4 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]" */