Signed-off-by: Dominique Martinet <[email protected]>
---
package/network/config/qos-scripts/files/usr/lib/qos/generate.sh | 6 ++++--
package/network/config/qos-scripts/files/usr/lib/qos/tcrules.awk | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
b/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
index 1158f0d..703b1f8 100755
--- a/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
+++ b/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
@@ -337,11 +337,13 @@ tc class add dev $dev parent 1: classid 1:1 hfsc sc rate
${rate}kbit ul rate ${r
if [ -n "$halfduplex" ]; then
export dev_up="tc qdisc del dev $device root >&- 2>&-
tc qdisc add dev $device root handle 1: hfsc
-tc filter add dev $device parent 1: protocol ip prio 10 u32 match u32 0 0
flowid 1:1 action mirred egress redirect dev ifb$ifbdev"
+tc filter add dev $device parent 1: protocol ipv6 prio 10 u32 match u32 0 0
flowid 1:1 action mirred egress redirect dev ifb$ifbdev
+tc filter add dev $device parent 1: protocol ip prio 11 u32 match u32 0 0
flowid 1:1 action mirred egress redirect dev ifb$ifbdev"
elif [ -n "$download" ]; then
append dev_${dir} "tc qdisc del dev $device ingress >&- 2>&-
tc qdisc add dev $device ingress
-tc filter add dev $device parent ffff: protocol ip prio 1 u32 match u32 0 0
flowid 1:1 action connmark action mirred egress redirect dev ifb$ifbdev" "$N"
+tc filter add dev $device parent ffff: protocol ipv6 prio 1 u32 match u32 0 0
flowid 1:1 action connmark action mirred egress redirect dev ifb$ifbdev
+tc filter add dev $device parent ffff: protocol ip prio 2 u32 match u32 0 0
flowid 1:1 action connmark action mirred egress redirect dev ifb$ifbdev" "$N"
fi
add_insmod cls_fw
add_insmod sch_hfsc
diff --git a/package/network/config/qos-scripts/files/usr/lib/qos/tcrules.awk
b/package/network/config/qos-scripts/files/usr/lib/qos/tcrules.awk
index 2a88714..c0738b1 100644
--- a/package/network/config/qos-scripts/files/usr/lib/qos/tcrules.awk
+++ b/package/network/config/qos-scripts/files/usr/lib/qos/tcrules.awk
@@ -84,7 +84,8 @@ END {
# filter rule
for (i = 1; i <= n; i++) {
- print "tc filter add dev "device" parent 1: prio "class[i]"
protocol ip handle "class[i]"/0xff fw flowid 1:"class[i] "0"
+ print "tc filter add dev "device" parent 1: prio "2*class[i]-1"
protocol ipv6 handle "class[i]"/0xff fw flowid 1:"class[i] "0"
+ print "tc filter add dev "device" parent 1: prio "2*class[i]"
protocol ip handle "class[i]"/0xff fw flowid 1:"class[i] "0"
filterc=1
if (filter[i] != "") {
print " tc filter add dev "device" parent "class[i]"00:
handle "filterc"0 "filter[i]
--
1.7.10.4
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
