From 115081dda5b05702efb6cd99a3facc9aaea693a1 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 29 Dec 2012 11:20:16 -0800 Subject: [PATCH] Tweak fq_codel documentation. Signed-off-by: Tom Eastep --- Shorewall/manpages/shorewall-tcclasses.xml | 4 ++-- Shorewall6/manpages/shorewall6-tcclasses.xml | 7 ++++--- docs/traffic_shaping.xml | 13 +++++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Shorewall/manpages/shorewall-tcclasses.xml b/Shorewall/manpages/shorewall-tcclasses.xml index b1566bb80..01a8813e8 100644 --- a/Shorewall/manpages/shorewall-tcclasses.xml +++ b/Shorewall/manpages/shorewall-tcclasses.xml @@ -599,8 +599,8 @@ dropping a packet. If this parameter is specified, packets which indicate that their hosts honor ECN will only be marked and not dropped, unless the queue size - hits limit bytes. Needs a tc - binary with RED support compiled in. Recommended. + hits limit bytes. + Recommended. diff --git a/Shorewall6/manpages/shorewall6-tcclasses.xml b/Shorewall6/manpages/shorewall6-tcclasses.xml index b9aa9eb6b..8955c5e9c 100644 --- a/Shorewall6/manpages/shorewall6-tcclasses.xml +++ b/Shorewall6/manpages/shorewall6-tcclasses.xml @@ -564,9 +564,10 @@ Added in Shorewall 4.5.12. When specified for a leaf - class, causes the class to use the FQ_CODEL (Fair-queuing - Controlled Delay) queuing discipline rather than SFQ. See - tc-fq_codel (8) for additional information. + class, causes the class to use the FQ_CODEL + (Fair-queuing Controlled-Delay) queuing + discipline rather than SFQ. See tc-fq_codel (8) for additional + information. Allowable codeloptions are: diff --git a/docs/traffic_shaping.xml b/docs/traffic_shaping.xml index fb466bc24..9e02ba3c6 100644 --- a/docs/traffic_shaping.xml +++ b/docs/traffic_shaping.xml @@ -804,6 +804,19 @@ ppp0 6000kbit 500kbit (5) for a description of the allowable redoptions. + + + fq_codel[=(codeloption,...)] - + Added in Shorewall 4.5.12. When specified on a leaf class, + causes the class to use the FQ CODEL (Fair-queuing + Controlled-delay) queuing discipline rather than SFQ. See + tc-fq_codel (8) for additional information. + + See shorewall-tcdevices + (5) for a description of the allowable + codloptions. +