Fold cake support into sqm

dtaht · Feb 19, 2015 · fd46c6d · fd46c6d
1 parent 5b3eecd
commit fd46c6d
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/net/sqm-scripts/files/usr/lib/sqm/simple.qos b/net/sqm-scripts/files/usr/lib/sqm/simple.qos
@@ -78,6 +78,9 @@ BE_CEIL=`expr $CEIL - 16`  # A little slop at the top
 LQ="quantum `get_mtu $IFACE $CEIL`"
 
 $TC qdisc del dev $IFACE root 2> /dev/null
+case $QDISC in
+	cake*) tc qdisc add dev $IFACE root $QDISC bandwidth ${CEIL}kbit besteffort ;;
+	*) 	
 $TC qdisc add dev $IFACE root handle 1: `get_stab_string` htb default 12
 $TC class add dev $IFACE parent 1: classid 1:1 htb $LQ rate ${CEIL}kbit ceil ${CEIL}kbit `get_htb_adsll_string`
 $TC class add dev $IFACE parent 1:1 classid 1:10 htb $LQ rate ${CEIL}kbit ceil ${CEIL}kbit prio 0 `get_htb_adsll_string`
@@ -89,7 +92,6 @@ $TC qdisc add dev $IFACE parent 1:11 handle 110: $QDISC `get_limit ${ELIMIT}` `g
 $TC qdisc add dev $IFACE parent 1:12 handle 120: $QDISC `get_limit ${ELIMIT}` `get_target "${ETARGET}" ${UPLINK}` `get_ecn ${EECN}` `get_quantum 300` `get_flows ${BE_RATE}` ${EQDISC_OPTS}
 $TC qdisc add dev $IFACE parent 1:13 handle 130: $QDISC `get_limit ${ELIMIT}` `get_target "${ETARGET}" ${UPLINK}` `get_ecn ${EECN}` `get_quantum 300` `get_flows ${BK_RATE}` ${EQDISC_OPTS}
 
-
 # Need a catchall rule
 
 $TC filter add dev $IFACE parent 1:0 protocol all prio 999 u32 \
@@ -119,6 +121,8 @@ $TC filter add dev $IFACE parent 1:0 protocol ip prio 8 \
 
 $TC filter add dev $IFACE parent 1:0 protocol ipv6 prio 9 \
 	 u32 match ip protocol 1 0xff flowid 1:13
+;;
+esac
 
 #diffserv $IFACE
 
@@ -144,13 +148,21 @@ then
 sqm_logger "Do not perform DSCP based filtering on ingress. (1-tier classification)"
 # Revert to no dscp based filtering
 $TC qdisc del dev $DEV root 2>/dev/null
+case $QDISC in
+	cake*) tc qdisc add dev $IFACE root $QDISC bandwidth ${DOWNLINK}kbit besteffort ;;
+	*) 	
 $TC qdisc add dev $DEV root handle 1: `get_stab_string` htb default 10
 $TC class add dev $DEV parent 1: classid 1:1 htb $LQ rate ${DOWNLINK}kbit ceil ${DOWNLINK}kbit `get_htb_adsll_string`
 $TC class add dev $DEV parent 1:1 classid 1:10 htb $LQ rate ${DOWNLINK}kbit ceil ${DOWNLINK}kbit prio 0 `get_htb_adsll_string`
 $TC qdisc add dev $DEV parent 1:10 handle 110: $QDISC `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_flows ${DOWNLINK}` ${IQDISC_OPTS}
+;;
+esac
 
 else
 sqm_logger "Perform DSCP based filtering on ingress. (3-tier classification)"
+case $QDISC in
+	cake*) tc qdisc add dev $IFACE root $QDISC bandwidth ${DOWNLINK}kbit besteffort ;;
+	*) 	
 $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:1 classid 1:10 htb $LQ rate ${CEIL}kbit ceil ${CEIL}kbit prio 0 `get_htb_adsll_string`
@@ -165,6 +177,8 @@ $TC qdisc add dev $DEV parent 1:12 handle 120: $QDISC `get_limit ${ILIMIT}` `get
 $TC qdisc add dev $DEV parent 1:13 handle 130: $QDISC `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_quantum 300` `get_flows ${BK_RATE}` ${IQDISC_OPTS}
 
 diffserv $DEV
+;;
+esac
 
 fi