[SQM] Fix simple.qos to allow using cake as ingress shaper

simple.qos had accidentally set up the egress shaper twice, once
with the true egress parameters and a second time using the ingress
parameters, effectively misconfiguring both directions. This bub
only affected situations where 3-tier ingress classification was
used.

Signed-off-by: Sebastian Moeller <[email protected]>

diff --git a/net/sqm-scripts/Makefile b/net/sqm-scripts/Makefile
index b65905cf49679a04adc96eab63d01751122b2b35..6a58481378e18ea93a0a083cc740f8018c9eac6a 100644 (file)
--- a/net/sqm-scripts/Makefile
+++ b/net/sqm-scripts/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sqm-scripts
 PKG_VERSION:=8
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 PKG_LICENSE:=GPLv2
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

diff --git a/net/sqm-scripts/files/usr/lib/sqm/simple.qos b/net/sqm-scripts/files/usr/lib/sqm/simple.qos
index e1ce37266cc920d7b9aa9c4f85ad9a61ae576d5e..5a36df1cf21da91935d1c7d6d33cbafeacbaea39 100755 (executable)
--- a/net/sqm-scripts/files/usr/lib/sqm/simple.qos
+++ b/net/sqm-scripts/files/usr/lib/sqm/simple.qos
@@ -177,7 +177,7 @@ else
     sqm_logger "Perform DSCP based filtering on ingress. (3-tier classification)"
     case $QDISC in
            cake*) 
-                   $TC qdisc add dev $IFACE root `get_stab_string` $QDISC bandwidth ${DOWNLINK}kbit `get_cake_lla_string` $CAKE_OPTS ${IQDISC_OPTS}
+                   $TC qdisc add dev $DEV root `get_stab_string` $QDISC bandwidth ${DOWNLINK}kbit `get_cake_lla_string` $CAKE_OPTS ${IQDISC_OPTS}
                    ;;
            *)  
                    $TC qdisc add dev $DEV root handle 1: `get_stab_string` htb default 12