Module Name: src Committed By: riz Date: Sun Nov 18 21:45:09 UTC 2012
Modified Files: src/sys/net/npf [netbsd-6]: npf_impl.h npf_state.c src/sys/rump/librump/rumpkern [netbsd-6]: rump.c src/sys/rump/net [netbsd-6]: Makefile.rumpnetcomp src/usr.sbin/npf/npftest [netbsd-6]: Makefile README npftest.c npftest.h src/usr.sbin/npf/npftest/libnpftest [netbsd-6]: npf_test.h npf_test_subr.c Added Files: src/sys/rump/net/lib/libnpf [netbsd-6]: Makefile component.c shlib_version Removed Files: src/sys/rump/dev/lib/libnpf [netbsd-6]: Makefile component.c shlib_version Log Message: Pull up following revision(s) (requested by rmind in ticket #678): sys/rump/librump/rumpkern/rump.c: revision 1.243 sys/rump/librump/rumpkern/rump.c: revision 1.244 sys/rump/librump/rumpkern/rump.c: revision 1.245 sys/rump/librump/rumpkern/rump.c: revision 1.246 usr.sbin/npf/npftest/npftest.c: revision 1.5 usr.sbin/npf/npftest/README: revision 1.2 usr.sbin/npf/npftest/npftest.h: revision 1.5 sys/rump/net/Makefile.rumpnetcomp: revision 1.5 sys/rump/net/lib/libnpf/shlib_version: revision 1.1 sys/net/npf/npf_impl.h: revision 1.22 sys/rump/dev/lib/libnpf/Makefile: file removal usr.sbin/npf/npftest/Makefile: revision 1.3 sys/rump/dev/lib/libnpf/component.c: file removal sys/rump/dev/lib/libnpf/shlib_version: file removal sys/net/npf/npf_state.c: revision 1.12 sys/rump/net/lib/libnpf/component.c: revision 1.1 usr.sbin/npf/npftest/libnpftest/npf_test_subr.c: revision 1.4 usr.sbin/npf/npftest/libnpftest/npf_test.h: revision 1.6 sys/rump/net/lib/libnpf/Makefile: revision 1.1 Move and rename librumpdev_npf to librumpnet_npf. Enable the build of librumpnet_npf. Add npf_state_setsampler() for _NPF_TESTING case. This also fixes the build. Call pserialize_init() during rump start-up, since librump/net/npf uses it. It helps to include the declaration of the routine being called. We also need kcpuset_init() now. Use correct routine name - kcpuset_sysinit() vs kcpuset_init() To generate a diff of this commit: cvs rdiff -u -r1.10.2.7 -r1.10.2.8 src/sys/net/npf/npf_impl.h cvs rdiff -u -r1.6.4.5 -r1.6.4.6 src/sys/net/npf/npf_state.c cvs rdiff -u -r1.1.18.2 -r0 src/sys/rump/dev/lib/libnpf/Makefile cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libnpf/component.c \ src/sys/rump/dev/lib/libnpf/shlib_version cvs rdiff -u -r1.240 -r1.240.2.1 src/sys/rump/librump/rumpkern/rump.c cvs rdiff -u -r1.4 -r1.4.16.1 src/sys/rump/net/Makefile.rumpnetcomp cvs rdiff -u -r0 -r1.2.4.2 src/sys/rump/net/lib/libnpf/Makefile cvs rdiff -u -r0 -r1.1.6.2 src/sys/rump/net/lib/libnpf/component.c \ src/sys/rump/net/lib/libnpf/shlib_version cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/usr.sbin/npf/npftest/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/usr.sbin/npf/npftest/README cvs rdiff -u -r1.3.2.3 -r1.3.2.4 src/usr.sbin/npf/npftest/npftest.c \ src/usr.sbin/npf/npftest/npftest.h cvs rdiff -u -r1.3.2.4 -r1.3.2.5 \ src/usr.sbin/npf/npftest/libnpftest/npf_test.h cvs rdiff -u -r1.1.2.4 -r1.1.2.5 \ src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.