Skip to content

Commit

Permalink
[NET]: kconfig, correct traffic shaper
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Slaby authored and David S. Miller committed Nov 7, 2006
1 parent 3d42488 commit 3b6a792
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/net/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2833,7 +2833,7 @@ config NET_FC
"SCSI generic support".

config SHAPER
tristate "Traffic Shaper (EXPERIMENTAL)"
tristate "Traffic Shaper (OBSOLETE)"
depends on EXPERIMENTAL
---help---
The traffic shaper is a virtual network device that allows you to
Expand All @@ -2842,9 +2842,9 @@ config SHAPER
these virtual devices. See
<file:Documentation/networking/shaper.txt> for more information.

An alternative to this traffic shaper is the experimental
Class-Based Queuing (CBQ) scheduling support which you get if you
say Y to "QoS and/or fair queuing" above.
An alternative to this traffic shaper are traffic schedulers which
you'll get if you say Y to "QoS and/or fair queuing" in
"Networking options".

To compile this driver as a module, choose M here: the module
will be called shaper. If unsure, say N.
Expand Down

0 comments on commit 3b6a792

Please sign in to comment.