diff --git a/docs/MultiISP.xml b/docs/MultiISP.xml
index 5974cbf01..bf0ca6f2b 100644
--- a/docs/MultiISP.xml
+++ b/docs/MultiISP.xml
@@ -171,13 +171,15 @@
You may not use the SAVE or RESTORE options unless you also
- set HIGH_ROUTE_MARKS=Yes in
+ set HIGH_ROUTE_MARKS=Yes (PROVIDER_OFFSET > 0 with Shorewall
+ 4.4.26 and later) in
/etc/shorewall/shorewall.conf.
You may not use connection marking unless you also set
- HIGH_ROUTE_MARKS=Yes in
+ HIGH_ROUTE_MARKS=Yes (PROVIDER_OFFSET > 0 with Shorewall 4.4.26
+ and later) in
/etc/shorewall/shorewall.conf.
@@ -226,7 +228,8 @@
value and will restore the packet mark in the PREROUTING CHAIN.
Mark values must be in the range 1-255.
- Alternatively, you may set HIGH_ROUTE_MARKS=Yes in
+ Alternatively, you may set HIGH_ROUTE_MARKS=Yes
+ (PROVIDER_OFFSET > 0 with Shorewall 4.4.26 and later) in
/etc/shorewall/shorewall.conf. This allows
you to:
diff --git a/docs/traffic_shaping.xml b/docs/traffic_shaping.xml
index 48148fe69..6fa18bb86 100644
--- a/docs/traffic_shaping.xml
+++ b/docs/traffic_shaping.xml
@@ -187,10 +187,12 @@
/etc/shorewall/tcrules file.
- In Shorewall 4.5.0, WIDE_TC_MARKS was superseded by TC_BITS
+ In Shorewall 4.4.26, WIDE_TC_MARKS was superseded by TC_BITS
which specifies the width in bits of the traffic shaping mark field.
The default is based on the setting of WIDE_TC_MARKS so as to
- provide upward compatibility.
+ provide upward compatibility. See the Packet Marking using
+ /etc/shorewall/tcrules article.
@@ -489,7 +491,7 @@ ppp0 6000kbit 500kbit
MARK - The mark value which is an integer in the range 1-255
- (1-16383 if you set WIDE_TC_MARKS=Yes in shorewall.conf (5) ). You
define these marks in the tcrules file, marking the traffic you want
to go into the queuing classes defined in here. You can use the same
@@ -829,12 +831,12 @@ ppp0 6000kbit 500kbit
MARK or CLASSIFY - MARK specifies the mark value is to be
assigned in case of a match. This is an integer in the range 1-255
- (1-16383 if you set WIDE_TC_MARKS=Yes in shorewall.conf (5)
).
- In Shorewall 4.5.0, WIDE_TC_MARKS was superseded by TC_BITS
+ In Shorewall 4.4.26, WIDE_TC_MARKS was superseded by TC_BITS
which specifies the width in bits of the traffic shaping mark
field. The default is based on the setting of WIDE_TC_MARKS so as
to provide upward compatibility.
@@ -950,12 +952,13 @@ ppp0 6000kbit 500kbit
Constructed by Shorewall. The method of construction
- depends on the setting of WIDE_TC_MARKS (shorewall.conf
(5)).
- When WIDE_TC_MARKS=No (the default), the <minor>
- class is:
+ When WIDE_TC_MARKS=No (the default) or TC_BITS > 14,
+ the <minor> class is:
@@ -967,8 +970,9 @@ ppp0 6000kbit 500kbit
- When WIDE_TC_MARKS=Yes, the <minor> class is
- assigned sequentially beginning with 2.
+ When WIDE_TC_MARKS=Yes (TC_BITS >= 14), the
+ <minor> class is assigned sequentially beginning with
+ 2.
@@ -1518,7 +1522,8 @@ IPMARK(src,0xff,0x10100):F 192.168.1.0/29 eth0
assigned sequentially beginning with 2. The WIDE_TC_MARKS option in
shorewall.conf selects which construction to use.
WIDE_TC_MARKS=No (the default) produces pre-Shorewall 4.4 behavior.
- WIDE_TC_MARKS=Yes produces the new behavior.
+ WIDE_TC_MARKS=Yes (TC_BITS >= 14 in Shorewall 4.4.26 and later)
+ produces the new behavior.