Luiz Otavio O Souza skrev: > > Author: loos > Date: Sat Apr 16 02:11:04 2016 > New Revision: 298091 > URL: https://svnweb.freebsd.org/changeset/base/298091 > > Log: > MFC r284777, r284814, r284863 and r298088: > > ALTQ FAIRQ discipline import from DragonFLY. > > Differential Revision: https://reviews.freebsd.org/D2847 > Obtained from: pfSense > Sponsored by: Rubicon Communications (Netgate) > > Added: > stable/10/sys/contrib/altq/altq/altq_fairq.c (contents, props changed) > stable/10/sys/contrib/altq/altq/altq_fairq.h (contents, props changed) > Modified: > stable/10/sbin/pfctl/parse.y > stable/10/sbin/pfctl/pfctl_altq.c > stable/10/sbin/pfctl/pfctl_parser.h > stable/10/sbin/pfctl/pfctl_qstats.c > stable/10/share/man/man4/altq.4 > stable/10/sys/conf/NOTES > stable/10/sys/conf/files > stable/10/sys/conf/options > stable/10/sys/contrib/altq/altq/altq.h > stable/10/sys/contrib/altq/altq/altq_subr.c > stable/10/sys/contrib/altq/altq/altq_var.h > stable/10/sys/netpfil/pf/pf.c > stable/10/sys/netpfil/pf/pf_altq.h > stable/10/sys/netpfil/pf/pf_mtag.h > Directory Properties: > stable/10/ (props changed) > > Modified: stable/10/sbin/pfctl/parse.y > ============================================================================== > --- stable/10/sbin/pfctl/parse.y Sat Apr 16 00:01:16 2016 > (r298090) > +++ stable/10/sbin/pfctl/parse.y Sat Apr 16 02:11:04 2016 > (r298091) > @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); > #include <altq/altq_cbq.h> > #include <altq/altq_priq.h> > #include <altq/altq_hfsc.h> > +#include <net/altq/altq_fairq.h> ^^^^ This is obviously wrong!?
Index: sbin/pfctl/parse.y =================================================================== --- sbin/pfctl/parse.y (revision 298102) +++ sbin/pfctl/parse.y (working copy) @@ -48,7 +48,7 @@ #include <altq/altq_cbq.h> #include <altq/altq_priq.h> #include <altq/altq_hfsc.h> -#include <net/altq/altq_fairq.h> +#include <altq/altq_fairq.h> #include <stdio.h> #include <unistd.h> Index: sbin/pfctl/pfctl_altq.c =================================================================== --- sbin/pfctl/pfctl_altq.c (revision 298102) +++ sbin/pfctl/pfctl_altq.c (working copy) @@ -42,7 +42,7 @@ #include <altq/altq_cbq.h> #include <altq/altq_priq.h> #include <altq/altq_hfsc.h> -#include <net/altq/altq_fairq.h> +#include <altq/altq_fairq.h> #include "pfctl_parser.h" #include "pfctl.h" Index: sbin/pfctl/pfctl_qstats.c =================================================================== --- sbin/pfctl/pfctl_qstats.c (revision 298102) +++ sbin/pfctl/pfctl_qstats.c (working copy) @@ -38,7 +38,7 @@ #include <altq/altq_cbq.h> #include <altq/altq_priq.h> #include <altq/altq_hfsc.h> -#include <net/altq/altq_fairq.h> +#include <altq/altq_fairq.h> #include "pfctl.h" #include "pfctl_parser.h" -- Herbert _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to "[email protected]"
