svn commit: r228182 - stable/9/sys/contrib/pf/net

[Gleb Smirnoff]

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