core130: Fix errors in rootfile

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

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index b623cbec91a73495fb42a9e431cb7d5c8dcbf0df..bc460db92b47caf4cd23601effa2af4dff54c664 100644 (file)
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -252,8 +252,8 @@ foreach $subclassentry (sort @subclasses) {
 }
 print <<END
 
-       ### add l7-filter to POSTROUTING chain to see all traffic
-       iptables -t mangle -A POSTROUTING -m layer7 --l7proto unset
+       ### add l7-filter to PREROUTING chain to see all traffic
+       iptables -t mangle -A PREROUTING -m layer7 --l7proto unset
 
        ### ADD QOS-OUT CHAIN TO THE MANGLE TABLE IN IPTABLES
        iptables -t mangle -N QOS-OUT
@@ -411,7 +411,7 @@ print <<END
                insmod ipt_IMQ
                sleep 2
        fi
-       modprobe imq numdevs=1
+       modprobe imq numdevs=1 numqueues=\$(grep -c "^processor" /proc/cpuinfo || echo 1)
        ip link set $qossettings{'IMQ_DEV'} up
 
        ### ADD HTB QDISC FOR $qossettings{'IMQ_DEV'}
@@ -715,7 +715,7 @@ print <<END
        iptables -t mangle --flush  QOS-TOS >/dev/null 2>&1
        iptables -t mangle --delete-chain QOS-TOS >/dev/null 2>&1
        # remove l7-filter
-       iptables -t mangle --delete POSTROUTING -m layer7 --l7proto unset
+       iptables -t mangle --delete PREROUTING -m layer7 --l7proto unset
 
        rmmod sch_htb >/dev/null 2>&1
 
@@ -726,7 +726,7 @@ print <<END
        echo "Quality of Service was successfully cleared!"
   ;;
   gen|generate)
-       echo -n "Generateing the QoS-Scripts..."
+       echo -n "Generating the QoS-Scripts..."
        /usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh
        echo ".Done!"
        exit 0