Module Name:	src
Committed By:	peter
Date:		Thu Oct 12 19:59:13 UTC 2006

Modified Files:
	src/dist/pf/sbin/pfctl: pfctl_altq.c pfctl_qstats.c
	src/distrib/sets/lists/comp: mi
	src/doc: BRANCHES CHANGES
	src/share/man/man4: options.4
	src/share/man/man9: altq.9
	src/sys/altq: Makefile altq.h altq_afmap.c altq_afmap.h altq_blue.c
	    altq_blue.h altq_cbq.c altq_cbq.h altq_cdnr.c altq_cdnr.h
	    altq_classq.h altq_conf.c altq_conf.h altq_fifoq.c altq_fifoq.h
	    altq_flowvalve.h altq_hfsc.c altq_hfsc.h altq_localq.c altq_priq.c
	    altq_priq.h altq_red.c altq_red.h altq_rio.c altq_rio.h
	    altq_rmclass.c altq_rmclass.h altq_rmclass_debug.h altq_subr.c
	    altq_var.h altq_wfq.c altq_wfq.h files.altq if_altq.h
	src/sys/dist/pf/net: pf.c pf_ioctl.c
	src/usr.sbin/altq/altqd: altq.conf.5
	src/usr.sbin/altq/altqstat: Makefile altqstat.c altqstat.h qdisc_cbq.c
	    qdisc_cdnr.c qdisc_conf.c qdisc_fifoq.c qdisc_hfsc.c qdisc_priq.c
	    qdisc_red.c qdisc_rio.c qdisc_wfq.c quip_client.c
	src/usr.sbin/altq/libaltq: Makefile qop_conf.c qop_hfsc.c qop_hfsc.h
Added Files:
	src/sys/altq: altq_jobs.c altq_jobs.h
	src/usr.sbin/altq/altqstat: qdisc_jobs.c
	src/usr.sbin/altq/libaltq: qop_jobs.c qop_jobs.h

Log Message:
Merge the peter-altq branch.

(sync with KAME & add support for using ALTQ with pf(4)).


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 src/dist/pf/sbin/pfctl/pfctl_altq.c
cvs rdiff -r1.4 -r1.5 src/dist/pf/sbin/pfctl/pfctl_qstats.c
cvs rdiff -r1.943 -r1.944 src/distrib/sets/lists/comp/mi
cvs rdiff -r1.117 -r1.118 src/doc/BRANCHES
cvs rdiff -r1.727 -r1.728 src/doc/CHANGES
cvs rdiff -r1.336 -r1.337 src/share/man/man4/options.4
cvs rdiff -r1.11 -r1.12 src/share/man/man9/altq.9
cvs rdiff -r1.2 -r1.3 src/sys/altq/Makefile src/sys/altq/altq_afmap.h \
    src/sys/altq/altq_flowvalve.h
cvs rdiff -r1.3 -r1.4 src/sys/altq/altq.h
cvs rdiff -r1.14 -r1.15 src/sys/altq/altq_afmap.c src/sys/altq/altq_priq.c \
    src/sys/altq/altq_rmclass.c src/sys/altq/altq_wfq.c
cvs rdiff -r1.18 -r1.19 src/sys/altq/altq_blue.c src/sys/altq/altq_cbq.c \
    src/sys/altq/altq_hfsc.c
cvs rdiff -r1.4 -r1.5 src/sys/altq/altq_blue.h src/sys/altq/altq_cdnr.h \
    src/sys/altq/altq_red.h src/sys/altq/altq_rio.h src/sys/altq/altq_wfq.h
cvs rdiff -r1.7 -r1.8 src/sys/altq/altq_cbq.h src/sys/altq/altq_hfsc.h \
    src/sys/altq/altq_localq.c
cvs rdiff -r1.15 -r1.16 src/sys/altq/altq_cdnr.c src/sys/altq/altq_subr.c
cvs rdiff -r1.6 -r1.7 src/sys/altq/altq_classq.h src/sys/altq/altq_fifoq.h \
    src/sys/altq/altq_priq.h src/sys/altq/altq_rmclass.h \
    src/sys/altq/altq_rmclass_debug.h
cvs rdiff -r1.16 -r1.17 src/sys/altq/altq_conf.c
cvs rdiff -r1.8 -r1.9 src/sys/altq/altq_conf.h src/sys/altq/altq_var.h
cvs rdiff -r1.12 -r1.13 src/sys/altq/altq_fifoq.c
cvs rdiff -r0 -r1.2 src/sys/altq/altq_jobs.c src/sys/altq/altq_jobs.h
cvs rdiff -r1.20 -r1.21 src/sys/altq/altq_red.c
cvs rdiff -r1.13 -r1.14 src/sys/altq/altq_rio.c
cvs rdiff -r1.5 -r1.6 src/sys/altq/files.altq
cvs rdiff -r1.10 -r1.11 src/sys/altq/if_altq.h
cvs rdiff -r1.26 -r1.27 src/sys/dist/pf/net/pf.c \
    src/sys/dist/pf/net/pf_ioctl.c
cvs rdiff -r1.8 -r1.9 src/usr.sbin/altq/altqd/altq.conf.5
cvs rdiff -r1.2 -r1.3 src/usr.sbin/altq/altqstat/Makefile
cvs rdiff -r1.5 -r1.6 src/usr.sbin/altq/altqstat/altqstat.c \
    src/usr.sbin/altq/altqstat/qdisc_cbq.c
cvs rdiff -r1.4 -r1.5 src/usr.sbin/altq/altqstat/altqstat.h \
    src/usr.sbin/altq/altqstat/qdisc_hfsc.c \
    src/usr.sbin/altq/altqstat/qdisc_priq.c \
    src/usr.sbin/altq/altqstat/qdisc_rio.c
cvs rdiff -r1.3 -r1.4 src/usr.sbin/altq/altqstat/qdisc_cdnr.c \
    src/usr.sbin/altq/altqstat/qdisc_conf.c \
    src/usr.sbin/altq/altqstat/qdisc_fifoq.c \
    src/usr.sbin/altq/altqstat/qdisc_red.c \
    src/usr.sbin/altq/altqstat/qdisc_wfq.c
cvs rdiff -r0 -r1.2 src/usr.sbin/altq/altqstat/qdisc_jobs.c
cvs rdiff -r1.8 -r1.9 src/usr.sbin/altq/altqstat/quip_client.c
cvs rdiff -r1.7 -r1.8 src/usr.sbin/altq/libaltq/Makefile \
    src/usr.sbin/altq/libaltq/qop_hfsc.c
cvs rdiff -r1.2 -r1.3 src/usr.sbin/altq/libaltq/qop_conf.c \
    src/usr.sbin/altq/libaltq/qop_hfsc.h
cvs rdiff -r0 -r1.2 src/usr.sbin/altq/libaltq/qop_jobs.c \
    src/usr.sbin/altq/libaltq/qop_jobs.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.