From 517954b7f5b57f48ecc21033f8b74fc7cc20eeb3 Mon Sep 17 00:00:00 2001 From: Sebastian Moeller Date: Mon, 29 Jun 2015 10:29:34 +0200 Subject: [PATCH] [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 --- net/sqm-scripts/Makefile | 2 +- net/sqm-scripts/files/usr/lib/sqm/simple.qos | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sqm-scripts/Makefile b/net/sqm-scripts/Makefile index b65905cf4..6a5848137 100644 --- 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 e1ce37266..5a36df1cf 100755 --- 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