svn commit: r226533 - head/sys/contrib/pf/net

[Bjoern A. Zeeb]

Author: bz
Date: Wed Oct 19 10:08:58 2011
New Revision: 226533
URL: http://svn.freebsd.org/changeset/base/226533

Log:
  In the non-FreeBSD case we do not expect PF_LOCK and friends to do anything.
  
  MFC after:	3 days

Modified:
  head/sys/contrib/pf/net/pfvar.h

Modified: head/sys/contrib/pf/net/pfvar.h
==============================================================================
--- head/sys/contrib/pf/net/pfvar.h	Wed Oct 19 10:04:24 2011	(r226532)
+++ head/sys/contrib/pf/net/pfvar.h	Wed Oct 19 10:08:58 2011	(r226533)
@@ -251,19 +251,10 @@ VNET_DECLARE(struct mtx,	 pf_task_mtx);
 	mtx_unlock(&V_pf_task_mtx);			\
 } while(0)
 #else
-extern struct mtx pf_task_mtx;
-
-#define	PF_ASSERT(h)	mtx_assert(&pf_task_mtx, (h))
-
-#define	PF_LOCK()	do {				\
-	PF_ASSERT(MA_NOTOWNED);				\
-	mtx_lock(&pf_task_mtx);				\
-} while(0)
-#define	PF_UNLOCK()	do {				\
-	PF_ASSERT(MA_OWNED);				\
-	mtx_unlock(&pf_task_mtx);			\
-} while(0)
-#endif
+#define	PF_ASSERT(h)
+#define	PF_LOCK()
+#define	PF_UNLOCK()
+#endif /* __FreeBSD__ */
 
 #define	PF_COPYIN(uaddr, kaddr, len, r)		do {	\
 	PF_UNLOCK();					\