From cec07a6be5548069e82405ec8725cac2fa0ade22 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Tue, 17 May 2011 18:34:41 -0700
Subject: [PATCH] Don't apply HTB quantum to HFSC

---
 Shorewall/Perl/Shorewall/Tc.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm
index ea8543e02..c9bd5a4bf 100644
--- a/Shorewall/Perl/Shorewall/Tc.pm
+++ b/Shorewall/Perl/Shorewall/Tc.pm
@@ -1544,7 +1544,11 @@ sub setup_traffic_shaping() {
 
 	    if ( $tcref->{leaf} && ! $tcref->{pfifo} ) {
 		$sfqinhex = in_hexp( ++$sfq);
-		emit( "run_tc qdisc add dev $device parent $classid handle $sfqinhex: sfq quantum \$quantum limit $tcref->{limit} perturb 10" );
+		if ( $devref->{qdisc} eq 'htb' ) {
+		    emit( "run_tc qdisc add dev $device parent $classid handle $sfqinhex: sfq quantum \$quantum limit $tcref->{limit} perturb 10" );
+		} else {
+		    emit( "run_tc qdisc add dev $device parent $classid handle $sfqinhex: sfq limit $tcref->{limit} perturb 10" );
+		}
 	    }
 	    #
 	    # add filters