Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b6a792f authored by Jiri Slaby's avatar Jiri Slaby Committed by David S. Miller
Browse files

[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: default avatarJiri Slaby <jirislaby@gmail.com>
Acked-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d424888

drivers/net/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -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
@@ -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.