From owner-svn-src-projects@FreeBSD.ORG  Fri Aug 24 14:25:58 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 35775106566B;
	Fri, 24 Aug 2012 14:25:58 +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 20B008FC0A;
	Fri, 24 Aug 2012 14:25:58 +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 q7OEPvnI051857;
	Fri, 24 Aug 2012 14:25:57 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7OEPvwt051855;
	Fri, 24 Aug 2012 14:25:57 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201208241425.q7OEPvwt051855@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 24 Aug 2012 14:25: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: r239652 - 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: Fri, 24 Aug 2012 14:25:58 -0000

Author: glebius
Date: Fri Aug 24 14:25:57 2012
New Revision: 239652
URL: http://svn.freebsd.org/changeset/base/239652

Log:
  Backout r239186 and provide correct fix.

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

Modified: projects/pf/head/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf.c	Fri Aug 24 14:22:47 2012	(r239651)
+++ projects/pf/head/sys/contrib/pf/net/pf.c	Fri Aug 24 14:25:57 2012	(r239652)
@@ -1074,7 +1074,10 @@ pf_state_key_clone(struct pf_state_key *
 	if (sk == NULL)
 		return (NULL);
 
-	bcopy(orig, sk, sizeof(struct pf_state_key));
+	bcopy(orig, sk, sizeof(struct pf_state_key_cmp));
+
+	TAILQ_INIT(&sk->states[PF_SK_WIRE]);
+	TAILQ_INIT(&sk->states[PF_SK_STACK]);
 
 	return (sk);
 }