From owner-svn-src-projects@FreeBSD.ORG  Tue May 29 10:35:57 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 90247106564A;
	Tue, 29 May 2012 10:35:57 +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 7AE8C8FC12;
	Tue, 29 May 2012 10:35:57 +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 q4TAZv4F069463;
	Tue, 29 May 2012 10:35:57 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4TAZvv0069461;
	Tue, 29 May 2012 10:35:57 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201205291035.q4TAZvv0069461@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 29 May 2012 10:35:57 +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: r236227 - 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: Tue, 29 May 2012 10:35:57 -0000

Author: glebius
Date: Tue May 29 10:35:56 2012
New Revision: 236227
URL: http://svn.freebsd.org/changeset/base/236227

Log:
  Remove incorrect assertion, I've added in r234456.

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

Modified: projects/pf/head/sys/contrib/pf/net/pf_lb.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf_lb.c	Tue May 29 09:11:19 2012	(r236226)
+++ projects/pf/head/sys/contrib/pf/net/pf_lb.c	Tue May 29 10:35:56 2012	(r236227)
@@ -356,10 +356,6 @@ pf_map_addr(sa_family_t af, struct pf_ru
 	struct pf_addr		*rmask = &rpool->cur->addr.v.a.mask;
 	struct pf_pooladdr	*acur = rpool->cur;
 
-	KASSERT((r->rule_flag & PFRULE_RULESRCTRACK ||
-	    r->rpool.opts & PF_POOL_STICKYADDR),
-	    ("%s for non-tracking rule %p", __func__, r));
-
 	if (*sn == NULL && r->rpool.opts & PF_POOL_STICKYADDR &&
 	    (r->rpool.opts & PF_POOL_TYPEMASK) != PF_POOL_NONE) {
 		*sn = pf_find_src_node(saddr, r, af, 0);