Module Name:	src
Committed By:	pavel
Date:		Sun Oct  1 12:52:24 UTC 2006

Modified Files:
	src/sys/dist/pf/net: pf.c pf_ioctl.c

Log Message:
In pf, there are lots of #ifdef ALTQ, but our ALTQ is not what pf expects,
and if ALTQ and pf are both enabled, it leads to compile errors. So,
change all tests for ALTQ to ALTQ_NEW, which won't be defined.

This allows simultaneous compilation of pf and ALTQ and is a temporary
measure before the peter-altq brach is merged.

Tested and approved by Peter Postma.


To generate a diff of this commit:
cvs rdiff -r1.23 -r1.24 src/sys/dist/pf/net/pf.c
cvs rdiff -r1.24 -r1.25 src/sys/dist/pf/net/pf_ioctl.c

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