From owner-svn-src-projects@FreeBSD.ORG  Sat Apr 14 06:52:32 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 936DC106564A;
	Sat, 14 Apr 2012 06:52:32 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E8FE8FC08;
	Sat, 14 Apr 2012 06:52:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3E6qWN8017495;
	Sat, 14 Apr 2012 06:52:32 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3E6qWUV017493;
	Sat, 14 Apr 2012 06:52:32 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201204140652.q3E6qWUV017493@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sat, 14 Apr 2012 06:52:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234271 - projects/pf/head/sys/contrib/pf/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2012 06:52:32 -0000

Author: glebius
Date: Sat Apr 14 06:52:31 2012
New Revision: 234271
URL: http://svn.freebsd.org/changeset/base/234271

Log:
  Remove PF_LOCK_ASSERT()s since this code can already be
  entered from pfsync swi, w/o pf Giant held. May be this
  is not safe, since tables aren't locked yet...

Modified:
  projects/pf/head/sys/contrib/pf/net/pf_table.c

Modified: projects/pf/head/sys/contrib/pf/net/pf_table.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf_table.c	Sat Apr 14 05:48:04 2012	(r234270)
+++ projects/pf/head/sys/contrib/pf/net/pf_table.c	Sat Apr 14 06:52:31 2012	(r234271)
@@ -730,7 +730,6 @@ pfr_lookup_addr(struct pfr_ktable *kt, s
 	}
 	if (ADDR_NETWORK(ad)) {
 		pfr_prepare_network(&mask, ad->pfra_af, ad->pfra_net);
-		PF_LOCK_ASSERT();
 		ke = (struct pfr_kentry *)rn_lookup(&sa, &mask, head);
 		if (ke && KENTRY_RNF_ROOT(ke))
 			ke = NULL;
@@ -914,7 +913,6 @@ pfr_route_kentry(struct pfr_ktable *kt, 
 	else if (ke->pfrke_af == AF_INET6)
 		head = kt->pfrkt_ip6;
 
-	PF_LOCK_ASSERT();
 	if (KENTRY_NETWORK(ke)) {
 		pfr_prepare_network(&mask, ke->pfrke_af, ke->pfrke_net);
 		rn = rn_addroute(&ke->pfrke_sa, &mask, head, ke->pfrke_node);
@@ -936,7 +934,6 @@ pfr_unroute_kentry(struct pfr_ktable *kt
 	else if (ke->pfrke_af == AF_INET6)
 		head = kt->pfrkt_ip6;
 
-	PF_LOCK_ASSERT();
 	if (KENTRY_NETWORK(ke)) {
 		pfr_prepare_network(&mask, ke->pfrke_af, ke->pfrke_net);
 		rn = rn_delete(&ke->pfrke_sa, &mask, head);