Revert "QoS: Move packet classification to FORWARD chain for ingress"

[people/pmueller/ipfire-2.x.git] / config / qos / makeqosscripts.pl

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 92b2d9e77a0f3c0158305b429287b584fe224e5a..394af53b926492f48c40c71edebbde4c6a4369e2 100644 (file)
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -58,7 +58,7 @@ my $subclassfile = "/var/ipfire/qos/subclasses";
 my $level7file = "/var/ipfire/qos/level7config";
 my $portfile = "/var/ipfire/qos/portconfig";
 my $tosfile = "/var/ipfire/qos/tosconfig";
-my $fqcodel_options = "limit 800 quantum 500";
+my $fqcodel_options = "limit 10240 quantum 1514";
 
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
@@ -405,8 +405,7 @@ print <<END
        ### $qossettings{'IMQ_DEV'}
        ###
 
-       tc qdisc del dev $qossettings{'RED_DEV'} root
-       tc qdisc del dev $qossettings{'RED_DEV'} ingress
+       tc qdisc del dev $qossettings{'RED_DEV'} ingress >/dev/null 2>&1
        tc qdisc add dev $qossettings{'RED_DEV'} handle ffff: ingress
 
        ### BRING UP $qossettings{'IMQ_DEV'}
@@ -655,8 +654,8 @@ END
 print <<END
 
        ## STARTING COLLECTOR
-       ( sleep 10 && /usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1) &
-       ( sleep 10 && /usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1) &
+       /usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1
+       /usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1
 
        for i in \$(ls \$RRDLOG/class_*.rrd); do
                rrdtool update \$i \$(date +%s): 2>/dev/null
@@ -668,7 +667,7 @@ print <<END
   clear|stop)
        ### RESET EVERYTHING TO A KNOWN STATE
        killall qosd >/dev/null 2>&1
-       (sleep 3 && killall -9 qosd &>/dev/null) &
+
        # DELETE QDISCS
        tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1
        tc qdisc del dev $qossettings{'RED_DEV'} ingress >/dev/null 2>&1