[PATCH 1/1] net: correct-Traffic-shaper-Kconfig

[PATCH 1/1] net: correct-Traffic-shaper-Kconfig

[Jiri Slaby]

correct-Traffic-shaper-Kconfig

Correct traffic shaper Kconfig text.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

---
commit fbdc1c0c5508c52eeb27a182b661ac1c460d91c0
tree 84995c9113a19ae1c104579b96e311f34a94bda9
parent fb63c3d00f6990e66752e05f98f13ff464e97b42
author Jiri Slaby <ku@bellona.localdomain> Sat, 08 Apr 2006 15:20:41 +0159
committer Jiri Slaby <ku@bellona.localdomain> Sat, 08 Apr 2006 15:20:41 +0159

 drivers/net/Kconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 15d4161..c5030db 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2802,9 +2802,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 is the Class-Based Queuing
+	  (CBQ) scheduling support which you 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.

Re: [PATCH 1/1] net: correct-Traffic-shaper-Kconfig

[Patrick McHardy]

Jiri Slaby wrote:
> kconfig, correct traffic shaper
> 
> CBQ is no longer experimental and is located in other subtree.
> 
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 0a999a8..e845df9 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -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 is the Class-Based Queuing
> +	  (CBQ) scheduling support which you get if you say Y to
> +	  "QoS and/or fair queuing" in "Networking options".

While you're at it .. CBQ is actually not a very good alternative
since it doesn't work properly on top of virtual network devices.
The closest match for an alternative would be TBF, but HTB and
HFSC also do fine. Maybe just point to the traffic schedulers in
general. I think you could also change EXPERIMENTAL to OBSOLETE
for the shaper device, the traffic schedulers are a lot more
flexible.

[PATCH 1/1] net: correct-Traffic-shaper-Kconfig

[Jiri Slaby]

kconfig, correct traffic shaper

CBQ is no longer experimental and is located in other subtree.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

---
commit 5ee1f6ff7e1f03ed8edb2461612346e9964b745d
tree debfe70d8c8338adb5ef1d860b07e4a00e760081
parent a3d771ef92954ce81363af9e0252490e2741fc21
author Jiri Slaby <ku@bellona.localdomain> Sun, 22 Oct 2006 17:34:59 +0159
committer Jiri Slaby <ku@bellona.localdomain> Sun, 22 Oct 2006 17:34:59 +0159

 drivers/net/Kconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0a999a8..e845df9 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -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 is the Class-Based Queuing
+	  (CBQ) scheduling support which you 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.