D1191.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1191.diff
View Options

	Index: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
	===================================================================
	--- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
	+++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
	@@ -33,6 +33,9 @@
	#include <sys/time.h>
	#include <sys/systm.h>
	# include <sys/dirent.h>
	+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000)
	+#include <sys/jail.h>
	+#endif
	# include <sys/mbuf.h>
	# include <sys/sockopt.h>
	#if !defined(__hpux)
	@@ -52,6 +55,12 @@
	#include <netinet/ip.h>
	#include <netinet/ip_var.h>
	#include <netinet/tcp.h>
	+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000)
	+#include <net/vnet.h>
	+#else
	+#define CURVNET_SET(arg)
	+#define CURVNET_RESTORE()
	+#endif
	#if defined(__osf__)
	# include <netinet/tcp_timer.h>
	#endif
	@@ -323,7 +332,9 @@

	SPL_NET(s);

	+ CURVNET_SET(TD_TO_VNET(p));
	error = ipf_ioctlswitch(&ipfmain, unit, data, cmd, mode, p->p_uid, p);
	+ CURVNET_RESTORE();
	if (error != -1) {
	SPL_X(s);
	return error;