From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 19 Jan 2016 23:56:34 +0000 (+0000)
Subject: qos-scripts: Fix classification of ingress traffic
X-Git-Tag: reboot~741
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5cafb9240efb1211c7a289f2d86c56b64a1e638a;p=openwrt%2Fstaging%2Fchunkeey.git

qos-scripts: Fix classification of ingress traffic

Set the save-mark mask for the qos_${cg} chain to 0xff instead of
0xf0.  With the old value, the nibble that was saved would be
masked during the restore, preventing ingress traffic from being
classified.  Thanks to nbd for recommending the fix.

Signed-off-by: Michael Marley <michael@michaelmarley.com>

SVN-Revision: 48388
---

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 8d22b675c4..caa1125795 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
@@ -427,7 +427,7 @@ ${iptrules:+${iptrules}${N}iptables -t mangle -A qos_${cg}_ct -j CONNMARK --save
 iptables -t mangle -A qos_${cg} -j CONNMARK --restore-mark --mask 0x0f
 iptables -t mangle -A qos_${cg} -m mark --mark 0/0x0f -j qos_${cg}_ct
 $pktrules
-${iptrules:+${iptrules}${N}iptables -t mangle -A qos_${cg} -j CONNMARK --save-mark --mask 0xf0}
+${iptrules:+${iptrules}${N}iptables -t mangle -A qos_${cg} -j CONNMARK --save-mark --mask 0xff}
 $up$N${down:+${down}$N}
 EOF
 	unset INSMOD