Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Dec 2011 15:15:13 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r228182 - stable/9/sys/contrib/pf/net
Message-ID:  <201112011515.pB1FFDad050737@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius
Date: Thu Dec  1 15:15:12 2011
New Revision: 228182
URL: http://svn.freebsd.org/changeset/base/228182

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:
  stable/9/sys/contrib/pf/net/pf.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)

Modified: stable/9/sys/contrib/pf/net/pf.c
==============================================================================
--- stable/9/sys/contrib/pf/net/pf.c	Thu Dec  1 15:01:23 2011	(r228181)
+++ stable/9/sys/contrib/pf/net/pf.c	Thu Dec  1 15:15:12 2011	(r228182)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112011515.pB1FFDad050737>