From owner-svn-src-all@FreeBSD.ORG  Thu Dec  1 15:20:36 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C2B5C1065670;
	Thu,  1 Dec 2011 15:20:36 +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 B25D98FC1E;
	Thu,  1 Dec 2011 15:20:36 +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 pB1FKaoh050968;
	Thu, 1 Dec 2011 15:20:36 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB1FKaTh050966;
	Thu, 1 Dec 2011 15:20:36 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201112011520.pB1FKaTh050966@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 1 Dec 2011 15:20:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228183 - releng/9.0/sys/contrib/pf/net
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Dec 2011 15:20:36 -0000

Author: glebius
Date: Thu Dec  1 15:20:36 2011
New Revision: 228183
URL: http://svn.freebsd.org/changeset/base/228183

Log:
  MFhead r228150:
  
    Return value should be conditional on return value of pfsync_defer_ptr()
  
    PR:		kern/162947
    Submitted by:	Matthieu Kraus <matthieu.kraus s2008.tu-chemnitz.de>
  
  Approved by:	re (kib)

Modified:
  releng/9.0/sys/contrib/pf/net/pf.c
Directory Properties:
  releng/9.0/sys/   (props changed)
  releng/9.0/sys/contrib/pf/   (props changed)

Modified: releng/9.0/sys/contrib/pf/net/pf.c
==============================================================================
--- releng/9.0/sys/contrib/pf/net/pf.c	Thu Dec  1 15:15:12 2011	(r228182)
+++ releng/9.0/sys/contrib/pf/net/pf.c	Thu Dec  1 15:20:36 2011	(r228183)
@@ -3770,8 +3770,8 @@ pf_test_rule(struct pf_rule **rm, struct
 		 * replies through it.
 		 */
 #ifdef __FreeBSD__
-		if (pfsync_defer_ptr != NULL)
-			pfsync_defer_ptr(*sm, m);
+		if (pfsync_defer_ptr != NULL &&
+			pfsync_defer_ptr(*sm, m))
 #else
 		if (pfsync_defer(*sm, m))
 #endif