From owner-svn-src-projects@FreeBSD.ORG  Tue Mar  6 13:57:29 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 1F8C8106566C;
	Tue,  6 Mar 2012 13:57:29 +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 0F0168FC1C;
	Tue,  6 Mar 2012 13:57:29 +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 q26DvS4L043094;
	Tue, 6 Mar 2012 13:57:28 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q26DvSlB043091;
	Tue, 6 Mar 2012 13:57:28 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201203061357.q26DvSlB043091@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 6 Mar 2012 13:57:28 +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: r232605 - 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, 06 Mar 2012 13:57:29 -0000

Author: glebius
Date: Tue Mar  6 13:57:28 2012
New Revision: 232605
URL: http://svn.freebsd.org/changeset/base/232605

Log:
  Fix error from last change: don't use M_ZERO for a zone with init method.

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

Modified: projects/pf/head/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf.c	Tue Mar  6 13:43:57 2012	(r232604)
+++ projects/pf/head/sys/contrib/pf/net/pf.c	Tue Mar  6 13:57:28 2012	(r232605)
@@ -788,7 +788,7 @@ pf_state_key_setup(struct pf_pdesc *pd, 
 	KASSERT((*skp == NULL && *nkp == NULL),
 		("%s: skp == NULL && nkp == NULL", __func__));
 
-	if ((*skp = uma_zalloc(V_pf_state_key_z, M_NOWAIT | M_ZERO)) == NULL)
+	if ((*skp = uma_zalloc(V_pf_state_key_z, M_NOWAIT)) == NULL)
 		return (ENOMEM);
 
 	PF_ACPY(&(*skp)->addr[pd->sidx], saddr, pd->af);
@@ -799,7 +799,7 @@ pf_state_key_setup(struct pf_pdesc *pd, 
 	(*skp)->af = pd->af;
 
 	if (nr != NULL) {
-		if ((*nkp = uma_zalloc(V_pf_state_key_z, M_NOWAIT | M_ZERO))
+		if ((*nkp = uma_zalloc(V_pf_state_key_z, M_NOWAIT))
 		    == NULL)
 			return (ENOMEM); /* caller must handle cleanup */
 

Modified: projects/pf/head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf_ioctl.c	Tue Mar  6 13:43:57 2012	(r232604)
+++ projects/pf/head/sys/contrib/pf/net/pf_ioctl.c	Tue Mar  6 13:57:28 2012	(r232605)
@@ -275,6 +275,7 @@ pf_state_key_ini(void *mem, int size, in
 {
 	struct pf_state_key *sk = mem;
 
+	bzero(sk, sizeof(*sk));
 	TAILQ_INIT(&sk->states);
 	return (0);
 }