kernel: fq_codel: dont reinit flow state

[openwrt/staging/dedeckeh.git] / package / qos-scripts / files / usr / lib / qos / generate.sh

diff --git a/package/qos-scripts/files/usr/lib/qos/generate.sh b/package/qos-scripts/files/usr/lib/qos/generate.sh
index 093967f7a1cfd0a4d53716f1da3cdb8fbc528a96..440b43f5d12fafec23390cfcb737d4a97f68e096 100755 (executable)
--- a/package/qos-scripts/files/usr/lib/qos/generate.sh
+++ b/package/qos-scripts/files/usr/lib/qos/generate.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-[ -e /etc/functions.sh ] && . /etc/functions.sh || . ./functions.sh
+[ -e /lib/functions.sh ] && . /lib/functions.sh || . ./functions.sh
 [ -x /sbin/modprobe ] && {
        insmod="modprobe"
        rmmod="$insmod -r"
@@ -53,8 +53,8 @@ parse_matching_rule() {
        done
        config_get type "$section" TYPE
        case "$type" in
-               classify) unset pkt; append "$var" "-m mark --mark 0";;
-               default) pkt=1; append "$var" "-m mark --mark 0";;
+               classify) unset pkt; append "$var" "-m mark --mark 0/0xff";;
+               default) pkt=1; append "$var" "-m mark --mark 0/0xff";;
                reclassify) pkt=1;;
        esac
        append "$var" "${proto:+-p $proto}"
@@ -161,8 +161,8 @@ parse_matching_rule() {
                                config_get class "${value##!}" classnr
                                [ -z "$class" ] && continue;
                                case "$value" in
-                                       !*) append "$var" "-m mark ! --mark $class";;
-                                       *) append "$var" "-m mark --mark $class";;
+                                       !*) append "$var" "-m mark ! --mark $class/0xff";;
+                                       *) append "$var" "-m mark --mark $class/0xff";;
                                esac
                        ;;
                        1:TOS)
@@ -344,8 +344,7 @@ tc filter add dev $device parent ffff: protocol ip prio 1 u32 match u32 0 0 flow
        fi
        add_insmod cls_fw
        add_insmod sch_hfsc
-       add_insmod sch_sfq
-       add_insmod sch_red
+       add_insmod sch_fq_codel
 
        cat <<EOF
 ${INSMOD:+$INSMOD$N}${dev_up:+$dev_up
@@ -386,7 +385,7 @@ add_rules() {
                        unset iptrule
                }
 
-               parse_matching_rule iptrule "$rule" "$options" "$prefix" "-j MARK --set-mark $target"
+               parse_matching_rule iptrule "$rule" "$options" "$prefix" "-j MARK --set-mark $target/0xff"
                append "$var" "$iptrule" "$N"
        done
 }
@@ -404,7 +403,7 @@ start_cg() {
                config_get maxsize "$class" maxsize
                [ -z "$maxsize" -o -z "$mark" ] || {
                        add_insmod ipt_length
-                       append pktrules "iptables -t mangle -A qos_${cg} -m mark --mark $mark -m length --length $maxsize: -j MARK --set-mark 0" "$N"
+                       append pktrules "iptables -t mangle -A qos_${cg} -m mark --mark $mark/0xff -m length --length $maxsize: -j MARK --set-mark 0/0xff" "$N"
                }
        done
        add_rules pktrules "$rules" "iptables -t mangle -A qos_${cg}"
@@ -423,9 +422,9 @@ start_cg() {
 $INSMOD
 iptables -t mangle -N qos_${cg} >&- 2>&-
 iptables -t mangle -N qos_${cg}_ct >&- 2>&-
-${iptrules:+${iptrules}${N}iptables -t mangle -A qos_${cg}_ct -j CONNMARK --save-mark}
-iptables -t mangle -A qos_${cg} -j CONNMARK --restore-mark
-iptables -t mangle -A qos_${cg} -m mark --mark 0 -j qos_${cg}_ct
+${iptrules:+${iptrules}${N}iptables -t mangle -A qos_${cg}_ct -j CONNMARK --save-mark --mask 0xff}
+iptables -t mangle -A qos_${cg} -j CONNMARK --restore-mark --mask 0xff
+iptables -t mangle -A qos_${cg} -m mark --mark 0/0xff -j qos_${cg}_ct
 $pktrules
 $up$N${down:+${down}$N}
 EOF
@@ -486,6 +485,13 @@ case "$1" in
                start_interfaces
        ;;
        firewall)
-               start_firewall
+               case "$2" in
+                       stop)
+                               stop_firewall
+                       ;;
+                       start|"")
+                               start_firewall
+                       ;;
+               esac
        ;;
 esac