aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/Kconfig
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2006-11-06 17:34:48 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-11-07 18:10:10 -0500
commit3b6a792f6ace33584897d1af08630c9acc0ce221 (patch)
tree1988836e385ad8129bca105697e78c00610543e6 /drivers/net/Kconfig
parent3d4248885b9fca818e7fe6b66328e714876d36ad (diff)
[NET]: kconfig, correct traffic shaper
As Patrick McHardy <kaber@trash.net> suggested, Traffic Shaper is now obsolete and alternative to it is no longer CBQ, since its problems with virtual devices, alter Kconfig text to reflect this -- put a link to the traffic schedulers as a whole. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Acked-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r--drivers/net/Kconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9cb3ca5806fc..6e863aa9894c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2833,7 +2833,7 @@ config NET_FC
2833 "SCSI generic support". 2833 "SCSI generic support".
2834 2834
2835config SHAPER 2835config SHAPER
2836 tristate "Traffic Shaper (EXPERIMENTAL)" 2836 tristate "Traffic Shaper (OBSOLETE)"
2837 depends on EXPERIMENTAL 2837 depends on EXPERIMENTAL
2838 ---help--- 2838 ---help---
2839 The traffic shaper is a virtual network device that allows you to 2839 The traffic shaper is a virtual network device that allows you to
@@ -2842,9 +2842,9 @@ config SHAPER
2842 these virtual devices. See 2842 these virtual devices. See
2843 <file:Documentation/networking/shaper.txt> for more information. 2843 <file:Documentation/networking/shaper.txt> for more information.
2844 2844
2845 An alternative to this traffic shaper is the experimental 2845 An alternative to this traffic shaper are traffic schedulers which
2846 Class-Based Queuing (CBQ) scheduling support which you get if you 2846 you'll get if you say Y to "QoS and/or fair queuing" in
2847 say Y to "QoS and/or fair queuing" above. 2847 "Networking options".
2848 2848
2849 To compile this driver as a module, choose M here: the module 2849 To compile this driver as a module, choose M here: the module
2850 will be called shaper. If unsure, say N. 2850 will be called shaper. If unsure, say N.