sys/netinet/ipfw/ip_fw2.c:2600: error: 'fw_one_pass' undeclared

Running

FreeBSD d254.dwolf.juniper.net. 9.0-CURRENT FreeBSD 9.0-CURRENT #1 r200055: Thu Dec  3 17:04:59 PST 2009     root_at_d254.dwolf.juniper.net.:/common/S4/obj/usr/src/sys/CANARY  i386

Sources updated to r200098; kernel build fails:

...
>>> Kernel build for CANARY started on Fri Dec  4 10:30:32 PST 2009
...
>>> stage 3.2: building everything
--------------------------------------------------------------
cd /usr/obj/usr/src/sys/CANARY; MAKEOBJDIRPREFIX=/usr/obj  MACHINE_ARCH=i386  MACHINE=i386  CPUTYPE=  GROFF_BIN_PATH=/usr/obj/usr/src/tmp/legacy/usr/b
in  GROFF_FONT_PATH=/usr/obj/usr/src/tmp/legacy/usr/share/groff_font  GROFF_TMAC_PATH=/usr/obj/usr/src/tmp/legacy/usr/share/tmac  _SHLIBDIRPREFIX=/usr
/obj/usr/src/tmp  VERSION="FreeBSD 9.0-CURRENT i386 900003"  INSTALL="sh /usr/src/tools/install.sh"  PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/ob
j/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/usr/games:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/usr/obj/usr/src/tmp/usr
/games:/sbin:/bin:/usr/sbin:/usr/bin NO_CTF=1 /usr/obj/usr/src/make.i386/make KERNEL=kernel all -DNO_MODULES_OBJ
cc -c -O -pipe  -std=c99 -g -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -
Wundef -Wno-pointer-sign -fformat-extensions -nostdinc  -I. -I/usr/src/sys -I/usr/src/sys/contrib/altq -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include
 opt_global.h -fno-common -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000  -mno-align-long-strings -mpreferred-s
tack-boundary=2  -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -fstack-protector -Werror  /usr/src/sys/netinet/ipfw/ip_fw2.c -I/usr/
src/sys/contrib/pf
/usr/src/sys/netinet/ipfw/ip_fw2.c: In function 'ipfw_chk':
/usr/src/sys/netinet/ipfw/ip_fw2.c:2600: error: 'fw_one_pass' undeclared (first use in this function)
/usr/src/sys/netinet/ipfw/ip_fw2.c:2600: error: (Each undeclared identifier is reported only once
/usr/src/sys/netinet/ipfw/ip_fw2.c:2600: error: for each function it appears in.)
*** Error code 1

Stop in /common/S4/obj/usr/src/sys/CANARY.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.


This appears to be fallout from r200059, but I could easily be wrong
about that.

Here's what I see when I look for fw_one_pass:

d254(9.0-C)[27] grep -nwr fw_one_pass /sys
/sys/netinet/ipfw/ip_fw2.c:171:    CTLFLAG_RW | CTLFLAG_SECURE3, &VNET_NAME(fw_one_pass), 0,
/sys/netinet/ipfw/ip_fw2.c:2578:                 * If fw_one_pass != 0 then just accept it.
/sys/netinet/ipfw/ip_fw2.c:2582:                if (fw_one_pass) {
/sys/netinet/ip_fw.h:656:VNET_DECLARE(int, fw_one_pass);
/sys/netinet/ip_fw.h:658:#define        V_fw_one_pass           VNET(fw_one_pass)
/sys/netinet/ip_input.c:234:VNET_DEFINE(int, fw_one_pass) = 1;
d254(9.0-C)[28] 

And ip_fw2.c does #include ip_fw.h, as expected....

Peace,
david
-- 
David H. Wolfskill				david_at_catwhisker.org
Depriving a girl or boy of an opportunity for education is evil.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.