misc/120057: Allow propper settings of ALTQ_HFSC. The check i wrong since even with the values forbidden from this check you get a concave curve.

[Ermal Luçi]

>Number:         120057
>Category:       misc
>Synopsis:       Allow propper settings of ALTQ_HFSC. The check i wrong since even with the values forbidden from this check you get a concave curve.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 27 19:50:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Ermal Luçi
>Release:        HEAD
>Organization:
>Environment:
FreeBSD  8.0-CURRENT FreeBSD 8.0-CURRENT #2: Mon Dec 17 22:57:03 CET 2007     root@:/usr/obj/usr/home/eri/development/compile/src/sys/GENERIC  amd64

>Description:
The authors of PF mistankely have inserted this patch which doesn't allow propper configuration of ALTQ_HFSC. With these parameters you can get a concave curve!
Even if you read the paper dedicated to HFSC on acm.org you will see that the original author used a curve prohibitted by authors of PF.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: pfctl_altq.c
===================================================================
RCS file: /home/eri/FreeBSD/src/contrib/pf/pfctl/pfctl_altq.c,v
retrieving revision 1.9
diff -u -r1.9 pfctl_altq.c
--- pfctl_altq.c	3 Jul 2007 12:30:02 -0000	1.9
+++ pfctl_altq.c	27 Jan 2008 19:41:11 -0000
@@ -690,13 +690,6 @@
 		return (-1);
 	}
 
-	if ((opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 != 0) ||
-	    (opts->lssc_m1 < opts->lssc_m2 && opts->lssc_m1 != 0) ||
-	    (opts->ulsc_m1 < opts->ulsc_m2 && opts->ulsc_m1 != 0)) {
-		warnx("m1 must be zero for convex curve: %s", pa->qname);
-		return (-1);
-	}
-
 	/*
 	 * admission control:
 	 * for the real-time service curve, the sum of the service curves


>Release-Note:
>Audit-Trail:
>Unformatted: