From owner-svn-src-user@FreeBSD.ORG  Thu Oct 15 15:55:35 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DC97A1065672;
	Thu, 15 Oct 2009 15:55:35 +0000 (UTC) (envelope-from eri@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CBFCA8FC17;
	Thu, 15 Oct 2009 15:55:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9FFtZnL077894;
	Thu, 15 Oct 2009 15:55:35 GMT (envelope-from eri@svn.freebsd.org)
Received: (from eri@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9FFtZqn077891;
	Thu, 15 Oct 2009 15:55:35 GMT (envelope-from eri@svn.freebsd.org)
Message-Id: <200910151555.n9FFtZqn077891@svn.freebsd.org>
From: Ermal Luçi <eri@FreeBSD.org>
Date: Thu, 15 Oct 2009 15:55:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198137 - user/eri/pf45/head/sys/contrib/pf/net
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Oct 2009 15:55:35 -0000

Author: eri
Date: Thu Oct 15 15:55:35 2009
New Revision: 198137
URL: http://svn.freebsd.org/changeset/base/198137

Log:
  Some more V_ foo.

Modified:
  user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c
  user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c

Modified: user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c	Thu Oct 15 15:30:41 2009	(r198136)
+++ user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c	Thu Oct 15 15:55:35 2009	(r198137)
@@ -711,7 +711,11 @@ pfsync_state_import(struct pfsync_state 
 		r = pf_main_ruleset.rules[
 		    PF_RULESET_FILTER].active.ptr_array[ntohl(sp->rule)];
 	else
+#ifdef __FreeBSD__
+		r = &V_pf_default_rule;
+#else
 		r = &pf_default_rule;
+#endif
 
 	if ((r->max_states && r->states_cur >= r->max_states))
 		goto cleanup;

Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c	Thu Oct 15 15:30:41 2009	(r198136)
+++ user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c	Thu Oct 15 15:55:35 2009	(r198137)
@@ -273,9 +273,9 @@ static VNET_DEFINE(struct cdevsw, pf_cde
 #define pf_cdevsw			VNET(pf_cdevsw)
 
 static volatile VNET_DEFINE(int, pf_pfil_hooked);
-#define V_pf_pfil_hooked			VNET(pf_pfil_hooked)
-VNET_DEFINE(int, pf_end_threads);
-struct mtx pf_task_mtx;
+#define V_pf_pfil_hooked	VNET(pf_pfil_hooked)
+VNET_DEFINE(int,		pf_end_threads);
+VNET_DEFINE(struct mtx,		pf_task_mtx);
 
 /* pfsync */
 pfsync_state_import_t 		*pfsync_state_import_ptr = NULL;
@@ -4378,7 +4378,7 @@ pf_unload(void)
         V_pf_end_threads = 1;
         while (V_pf_end_threads < 2) {
                 wakeup_one(pf_purge_thread);
-                msleep(pf_purge_thread, &pf_task_mtx, 0, "pftmo", hz);
+                msleep(pf_purge_thread, &V_pf_task_mtx, 0, "pftmo", hz);
         }
         pfi_cleanup();
         pf_osfp_flush();