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

Bjoern A. Zeeb bz at FreeBSD.org
Wed Nov 23 18:10:48 UTC 2011


Author: bz
Date: Wed Nov 23 18:10:47 2011
New Revision: 227898
URL: http://svn.freebsd.org/changeset/base/227898

Log:
  MFC r226938 (by kevlo):
  
   Add missing PF_UNLOCK in pf_test
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/contrib/pf/net/pf.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/contrib/pf/net/pf.c
==============================================================================
--- stable/9/sys/contrib/pf/net/pf.c	Wed Nov 23 18:06:50 2011	(r227897)
+++ stable/9/sys/contrib/pf/net/pf.c	Wed Nov 23 18:10:47 2011	(r227898)
@@ -7176,11 +7176,15 @@ pf_test6(int dir, struct ifnet *ifp, str
 	}
 
 #ifdef __FreeBSD__
-	if (pd.pf_mtag->flags & PF_TAG_GENERATED)
+	if (pd.pf_mtag->flags & PF_TAG_GENERATED) {
+		PF_UNLOCK();
 #else
 	if (m->m_pkthdr.pf.flags & PF_TAG_GENERATED)
 #endif
 		return (PF_PASS);
+#ifdef __FreeBSD__
+	}
+#endif
 
 	/* We do IP header normalization and packet reassembly here */
 	if (pf_normalize_ip6(m0, dir, kif, &reason, &pd) != PF_PASS) {


More information about the svn-src-stable-9 mailing list