Date: Fri, 7 Sep 2012 20:57:36 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r240212 - projects/pf/head/sys/contrib/pf/net Message-ID: <201209072057.q87KvaCd061955@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Fri Sep 7 20:57:36 2012 New Revision: 240212 URL: http://svn.freebsd.org/changeset/base/240212 Log: Fix VIMAGE build. Modified: projects/pf/head/sys/contrib/pf/net/pf.c projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Modified: projects/pf/head/sys/contrib/pf/net/pf.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf.c Fri Sep 7 19:42:36 2012 (r240211) +++ projects/pf/head/sys/contrib/pf/net/pf.c Fri Sep 7 20:57:36 2012 (r240212) @@ -1238,7 +1238,6 @@ pf_intr(void *v) { struct pf_send_head queue; struct pf_send_entry *pfse, *next; - struct pf_sen CURVNET_SET((struct vnet *)v); @@ -1273,7 +1272,6 @@ pf_intr(void *v) } free(pfse, M_PFTEMP); } - CURVNET_RESTORE(); } Modified: projects/pf/head/sys/contrib/pf/net/pf_ioctl.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Fri Sep 7 19:42:36 2012 (r240211) +++ projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Fri Sep 7 20:57:36 2012 (r240212) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include <sys/fcntl.h> #include <sys/filio.h> #include <sys/interrupt.h> +#include <sys/jail.h> #include <sys/kernel.h> #include <sys/kthread.h> #include <sys/mbuf.h> @@ -59,10 +60,11 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/sysctl.h> #include <sys/md5.h> -#include <net/pfil.h> +#include <sys/ucred.h> #include <net/if.h> #include <net/route.h> +#include <net/pfil.h> #include <net/pfvar.h> #include <net/if_pfsync.h> #include <net/if_pflog.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209072057.q87KvaCd061955>