Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[SQM] Fix changes relating to cake lnk layer adjustments

Browse source 
The last batch of changes tried to teach the GUI to pass link layer
options to cake but forgot to actually call the function that parses
the GUI variables and used it as a string insteead. So this fixes that
it also tries to allow the use of the tc_stab link layer adjustment
method with cake so the implementations can be validated against each other
easily. Needs testing...

Signed-off-by: Sebastian Moeller <moeller0@gmx.de>
This commit is contained in:
Sebastian Moeller 2015-06-18 21:54:21 +02:00 committed by Toke Høiland-Jørgensen
parent 05fe796a8b
commit 30e02086c5
2 changed files with 35 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
net/sqm-scripts/files/usr/lib/sqm/simple.qos
View file

@ -92,7 +92,7 @@ LQ="quantum `get_mtu $IFACE $CEIL`"
$TC qdisc del dev $IFACE root 2> /dev/null $TC qdisc del dev $IFACE root 2> /dev/null
case $QDISC in case $QDISC in
cake*) cake*)
$TC qdisc add dev $IFACE root $QDISC bandwidth ${CEIL}kbit get_cake_lla_string ${EQDISC_OPTS} $TC qdisc add dev $IFACE root `get_stab_string` $QDISC bandwidth ${CEIL}kbit `get_cake_lla_string` ${EQDISC_OPTS}
;; ;;
*) *)
$TC qdisc add dev $IFACE root handle 1: `get_stab_string` htb default 12 $TC qdisc add dev $IFACE root handle 1: `get_stab_string` htb default 12
@ -163,7 +163,7 @@ sqm_logger "Do not perform DSCP based filtering on ingress. (1-tier classificati
# Revert to no dscp based filtering # Revert to no dscp based filtering
case $QDISC in case $QDISC in
cake*) cake*)
$TC qdisc add dev $DEV root $QDISC bandwidth ${DOWNLINK}kbit besteffort get_cake_lla_string ${IQDISC_OPTS} $TC qdisc add dev $DEV root `get_stab_string` $QDISC bandwidth ${DOWNLINK}kbit besteffort `get_cake_lla_string` ${IQDISC_OPTS}
;; ;;
*) *)
$TC qdisc add dev $DEV root handle 1: `get_stab_string` htb default 10 $TC qdisc add dev $DEV root handle 1: `get_stab_string` htb default 10
@ -176,7 +176,9 @@ esac
else else
sqm_logger "Perform DSCP based filtering on ingress. (3-tier classification)" sqm_logger "Perform DSCP based filtering on ingress. (3-tier classification)"
case $QDISC in case $QDISC in
cake*) $TC qdisc add dev $IFACE root $QDISC bandwidth ${DOWNLINK}kbit $CAKE_OPTS;; 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 handle 1: `get_stab_string` htb default 12 $TC qdisc add dev $DEV root handle 1: `get_stab_string` htb default 12
$TC class add dev $DEV parent 1: classid 1:1 htb $LQ rate ${CEIL}kbit ceil ${CEIL}kbit `get_htb_adsll_string` $TC class add dev $DEV parent 1: classid 1:1 htb $LQ rate ${CEIL}kbit ceil ${CEIL}kbit `get_htb_adsll_string`
@ -194,7 +196,6 @@ $TC qdisc add dev $DEV parent 1:13 handle 130: $QDISC `get_limit ${ILIMIT}` `get
diffserv $DEV diffserv $DEV
;; ;;
esac esac
fi fi
ifconfig $DEV up ifconfig $DEV up

4
net/sqm-scripts/files/usr/lib/sqm/simplest.qos
View file

@ -19,7 +19,7 @@ LQ="quantum `get_mtu $IFACE ${UPLINK}`"
$TC qdisc del dev $IFACE root 2>/dev/null $TC qdisc del dev $IFACE root 2>/dev/null
case $QDISC in case $QDISC in
cake*) cake*)
$TC qdisc add dev $IFACE root cake bandwidth ${UPLINK}kbit besteffort get_cake_lla_string ${EQDISC_OPTS} $TC qdisc add dev $IFACE root `get_stab_string` cake bandwidth ${UPLINK}kbit besteffort `get_cake_lla_string` ${EQDISC_OPTS}
;; ;;
*) *)
$TC qdisc add dev $IFACE root handle 1: `get_stab_string` htb default 10 $TC qdisc add dev $IFACE root handle 1: `get_stab_string` htb default 10
@ -42,7 +42,7 @@ LQ="quantum `get_mtu $IFACE ${DOWNLINK}`"
$TC qdisc del dev $DEV root 2>/dev/null $TC qdisc del dev $DEV root 2>/dev/null
case $QDISC in case $QDISC in
cake*) cake*)
$TC qdisc add dev $DEV root cake bandwidth ${DOWNLINK}kbit besteffort get_cake_lla_string ${IQDISC_OPTS} $TC qdisc add dev $DEV root `get_stab_string` cake bandwidth ${DOWNLINK}kbit besteffort `get_cake_lla_string` ${IQDISC_OPTS}
;; ;;
*) *)
$TC qdisc add dev $DEV root handle 1: `get_stab_string` htb default 10 $TC qdisc add dev $DEV root handle 1: `get_stab_string` htb default 10