From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, thirteen,
 updated. 2b710ab3fa07fa6dbe31cf72c57b21cf30d43418
Date: Thu, 30 Aug 2012 19:17:55 +0200
Message-ID: <20120830171755.EC3F2200A8@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4376948363716546700=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============4376948363716546700==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, thirteen has been updated
       via  2b710ab3fa07fa6dbe31cf72c57b21cf30d43418 (commit)
      from  211947fa963ccbbc05acde31acf2489b96d44f99 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2b710ab3fa07fa6dbe31cf72c57b21cf30d43418
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Aug 30 19:17:17 2012 +0200

    QoS: Use fq_codel instead of sfq.

-----------------------------------------------------------------------

Summary of changes:
 config/qos/makeqosscripts.pl |    5 +++--
 html/cgi-bin/qos.cgi         |    6 +-----
 2 files changed, 4 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 0b97b85..122e6b9 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -76,6 +76,7 @@ $qossettings{'IMQ_DEV'} =3D 'imq0';
 $qossettings{'TOS'} =3D '';
 $qossettings{'VALID'} =3D 'yes';
 $qossettings{'IMQ_MODE'} =3D 'PREROUTING';
+$qossettings{'QLENGTH'} =3D '1000';
=20
 &General::readhash("${General::swroot}/qos/settings", \%qossettings);
=20
@@ -480,7 +481,7 @@ foreach $classentry (sort @classes)
 	if ($qossettings{'IMQ_DEV'} eq $classline[0]) {
 		$qossettings{'DEVICE'} =3D $classline[0];
 		$qossettings{'CLASS'} =3D $classline[1];
-		print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CL=
ASS'} handle $qossettings{'CLASS'}: sfq perturb $qossettings{'SFQ_PERTUB'}\n";
+		print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CL=
ASS'} handle $qossettings{'CLASS'}: fq_codel\n";
 	}
 }
 foreach $subclassentry (sort @subclasses) {
@@ -488,7 +489,7 @@ foreach $subclassentry (sort @subclasses) {
 	if ($qossettings{'IMQ_DEV'} eq $subclassline[0]) {
 		$qossettings{'DEVICE'} =3D $subclassline[0];
 		$qossettings{'SCLASS'} =3D $subclassline[2];
-		print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'SC=
LASS'} handle $qossettings{'SCLASS'}: sfq perturb $qossettings{'SFQ_PERTUB'}\=
n";
+		print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'SC=
LASS'} handle $qossettings{'SCLASS'}: fq_codel\n";
 	}
 }
 print "\n\t### FILTER TRAFFIC INTO CLASSES\n";
diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 844058d..300e6ae 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -74,8 +74,7 @@ $qossettings{'DEFCLASS_INC'} =3D '';
 $qossettings{'DEFCLASS_OUT'} =3D '';
 $qossettings{'ACK'} =3D '';
 $qossettings{'MTU'} =3D '1492';
-$qossettings{'SFQ_PERTUB'} =3D '10';
-$qossettings{'QLENGTH'} =3D '30';
+$qossettings{'QLENGTH'} =3D '1000';
 $qossettings{'RED_DEV'} =3D 'ppp0';
 $qossettings{'IMQ_DEV'} =3D 'imq0';
 $qossettings{'VALID'} =3D 'yes';
@@ -1448,9 +1447,6 @@ sub expert
 		    <td width=3D'33%' align=3D'center'>$Lang::tr{'mtu QoS'}
 		<tr><td width=3D'33%' align=3D'right'>$Lang::tr{'Queuelenght'}:<td width=
=3D'33%' align=3D'left'>
 			<input type=3D'text' name=3D'QLENGTH' maxlength=3D'8' required=3D'2' valu=
e=3D'$qossettings{'QLENGTH'}' />
-		    <td width=3D'33%' align=3D'center'>&nbsp;
-		<tr><td width=3D'33%' align=3D'right'>SFQ Perturb:<td width=3D'33%' align=
=3D'left'>
-			<input type=3D'text' name=3D'SFQ_PERTUB' maxlength=3D'8' required=3D'1' v=
alue=3D'$qossettings{'SFQ_PERTUB'}' />
 		    <td width=3D'33%' align=3D'center'><input type=3D'submit' name=3D'ACTI=
ON' value=3D'$Lang::tr{'save'}' />
 		</table>
 		</form>


hooks/post-receive
--
IPFire 2.x development tree

--===============4376948363716546700==--