* [PATCH 1/1] net: correct-Traffic-shaper-Kconfig
@ 2006-10-22 15:40 Jiri Slaby
2006-10-22 16:55 ` Patrick McHardy
0 siblings, 1 reply; 6+ messages in thread
From: Jiri Slaby @ 2006-10-22 15:40 UTC (permalink / raw)
To: Andrew Morton; +Cc: Linux Kernel Mailing List, netdev, jgarzik
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.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] net: correct-Traffic-shaper-Kconfig
2006-10-22 15:40 [PATCH 1/1] net: correct-Traffic-shaper-Kconfig Jiri Slaby
@ 2006-10-22 16:55 ` Patrick McHardy
2006-11-04 20:52 ` [PATCH 1/1] Net: kconfig, correct traffic shaper Jiri Slaby
0 siblings, 1 reply; 6+ messages in thread
From: Patrick McHardy @ 2006-10-22 16:55 UTC (permalink / raw)
To: Jiri Slaby; +Cc: Andrew Morton, Linux Kernel Mailing List, netdev, jgarzik
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] Net: kconfig, correct traffic shaper
2006-10-22 16:55 ` Patrick McHardy
@ 2006-11-04 20:52 ` Jiri Slaby
2006-11-05 14:34 ` Patrick McHardy
2006-11-06 7:52 ` Jeff Garzik
0 siblings, 2 replies; 6+ messages in thread
From: Jiri Slaby @ 2006-11-04 20:52 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, Alan Cox, Patrick McHardy, netdev, jgarzik
Patrick McHardy <kaber@trash.net> wrote:
> 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.
Ok, thanks for comments. Here it comes, please (n)ack it:
--
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>
Cc: Alan Cox <alan@redhat.com>
Cc: Patrick McHardy <kaber@trash.net>
---
commit 95045e128e4db8cc07b9a616e6c1f3606b3b499f
tree 3e924080ba76042c93e687a156483d6279e961ed
parent 7e8fb7980d776e6a7c0bd84cc48b1cb9de139b8f
author Jiri Slaby <jirislaby@gmail.com> Sat, 04 Nov 2006 21:41:33 +0059
committer Jiri Slaby <jirislaby@gmail.com> Sat, 04 Nov 2006 21:41:33 +0059
drivers/net/Kconfig | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ee5ce6b..2ede616 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2847,7 +2847,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
@@ -2856,9 +2856,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.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Net: kconfig, correct traffic shaper
2006-11-04 20:52 ` [PATCH 1/1] Net: kconfig, correct traffic shaper Jiri Slaby
@ 2006-11-05 14:34 ` Patrick McHardy
2006-11-06 7:52 ` Jeff Garzik
1 sibling, 0 replies; 6+ messages in thread
From: Patrick McHardy @ 2006-11-05 14:34 UTC (permalink / raw)
To: Jiri Slaby; +Cc: Andrew Morton, linux-kernel, Alan Cox, netdev, jgarzik
Jiri Slaby wrote:
> Ok, thanks for comments. Here it comes, please (n)ack it:
>
> --
>
> 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>
> Cc: Alan Cox <alan@redhat.com>
> Cc: Patrick McHardy <kaber@trash.net>
Looks good, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Net: kconfig, correct traffic shaper
2006-11-04 20:52 ` [PATCH 1/1] Net: kconfig, correct traffic shaper Jiri Slaby
2006-11-05 14:34 ` Patrick McHardy
@ 2006-11-06 7:52 ` Jeff Garzik
2006-11-06 22:36 ` David Miller
1 sibling, 1 reply; 6+ messages in thread
From: Jeff Garzik @ 2006-11-06 7:52 UTC (permalink / raw)
To: Jiri Slaby
Cc: Andrew Morton, linux-kernel, Alan Cox, Patrick McHardy, netdev,
David S. Miller
Jiri Slaby wrote:
> Patrick McHardy <kaber@trash.net> wrote:
>> 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.
>
> Ok, thanks for comments. Here it comes, please (n)ack it:
>
> --
>
> 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>
> Cc: Alan Cox <alan@redhat.com>
> Cc: Patrick McHardy <kaber@trash.net>
ACK from me, though I think that since it relates to traffic schedulers
I think this patch should be merged through DaveM...
Jeff
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Net: kconfig, correct traffic shaper
2006-11-06 7:52 ` Jeff Garzik
@ 2006-11-06 22:36 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2006-11-06 22:36 UTC (permalink / raw)
To: jgarzik; +Cc: jirislaby, akpm, linux-kernel, alan, kaber, netdev
From: Jeff Garzik <jgarzik@pobox.com>
Date: Mon, 06 Nov 2006 02:52:02 -0500
> ACK from me, though I think that since it relates to traffic schedulers
> I think this patch should be merged through DaveM...
I've merged it into my tree, thanks everyone.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2006-11-06 22:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-22 15:40 [PATCH 1/1] net: correct-Traffic-shaper-Kconfig Jiri Slaby
2006-10-22 16:55 ` Patrick McHardy
2006-11-04 20:52 ` [PATCH 1/1] Net: kconfig, correct traffic shaper Jiri Slaby
2006-11-05 14:34 ` Patrick McHardy
2006-11-06 7:52 ` Jeff Garzik
2006-11-06 22:36 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).