[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>
This commit is contained in:
parent
3d4248885b
commit
3b6a792f6a
1 changed files with 4 additions and 4 deletions
|
@ -2833,7 +2833,7 @@ config NET_FC
|
||||||
"SCSI generic support".
|
"SCSI generic support".
|
||||||
|
|
||||||
config SHAPER
|
config SHAPER
|
||||||
tristate "Traffic Shaper (EXPERIMENTAL)"
|
tristate "Traffic Shaper (OBSOLETE)"
|
||||||
depends on EXPERIMENTAL
|
depends on EXPERIMENTAL
|
||||||
---help---
|
---help---
|
||||||
The traffic shaper is a virtual network device that allows you to
|
The traffic shaper is a virtual network device that allows you to
|
||||||
|
@ -2842,9 +2842,9 @@ config SHAPER
|
||||||
these virtual devices. See
|
these virtual devices. See
|
||||||
<file:Documentation/networking/shaper.txt> for more information.
|
<file:Documentation/networking/shaper.txt> for more information.
|
||||||
|
|
||||||
An alternative to this traffic shaper is the experimental
|
An alternative to this traffic shaper are traffic schedulers which
|
||||||
Class-Based Queuing (CBQ) scheduling support which you get if you
|
you'll get if you say Y to "QoS and/or fair queuing" in
|
||||||
say Y to "QoS and/or fair queuing" above.
|
"Networking options".
|
||||||
|
|
||||||
To compile this driver as a module, choose M here: the module
|
To compile this driver as a module, choose M here: the module
|
||||||
will be called shaper. If unsure, say N.
|
will be called shaper. If unsure, say N.
|
||||||
|
|
Loading…
Add table
Reference in a new issue