diff options
| author | mlaier <mlaier@FreeBSD.org> | 2006-11-30 18:55:36 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2006-11-30 18:55:36 +0000 |
| commit | 7a56ec02c0689eb39209938c7934c6833ed44923 (patch) | |
| tree | ba3b2863f26a1faecd8001f82a3429378b03f58f /contrib/pf | |
| parent | d593c1aca3499af4dff8356df26ca62623c5052f (diff) | |
| download | FreeBSD-src-7a56ec02c0689eb39209938c7934c6833ed44923.zip FreeBSD-src-7a56ec02c0689eb39209938c7934c6833ed44923.tar.gz | |
From OpenBSD, rev. 1.91:
fix servicecurve check; no point in checking the same sc three times, it
was obviously intended to check all three. has been wrong since the
beginning, 4 years... noticed by Earl Lapus <earl.lapus@gmail.com>, Vasil
Dimov <vd@FreeBSD.org> mailed me then, ok mcbride
MFC after: 3 days
Diffstat (limited to 'contrib/pf')
| -rw-r--r-- | contrib/pf/pfctl/pfctl_altq.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/pf/pfctl/pfctl_altq.c b/contrib/pf/pfctl/pfctl_altq.c index 384d1a2..4b2e8ff 100644 --- a/contrib/pf/pfctl/pfctl_altq.c +++ b/contrib/pf/pfctl/pfctl_altq.c @@ -1,4 +1,5 @@ /* $OpenBSD: pfctl_altq.c,v 1.86 2005/02/28 14:04:51 henning Exp $ */ +/* add: $OpenBSD: pfctl_altq.c,v 1.91 2006/11/28 00:08:50 henning Exp $ */ /* * Copyright (c) 2002 @@ -709,8 +710,8 @@ eval_pfqueue_hfsc(struct pfctl *pf, struct pf_altq *pa) } if ((opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 != 0) || - (opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 != 0) || - (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); } |
