svn commit: r196228 - in head/sys: conf net

[Marko Zec]

Author: zec
Date: Fri Aug 14 22:41:39 2009
New Revision: 196228
URL: http://svn.freebsd.org/changeset/base/196228

Log:
  Make VNET_DEBUG a standalone compile-time option, i.e. decouple it from
  INVARIANTS.
  
  Reviewed by:	bz
  Approved by:	re (rwatson), julian (mentor)

Modified:
  head/sys/conf/options
  head/sys/net/vnet.h

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Fri Aug 14 21:50:47 2009	(r196227)
+++ head/sys/conf/options	Fri Aug 14 22:41:39 2009	(r196228)
@@ -821,8 +821,9 @@ TDMA_TXRATE_QUARTER_DEFAULT	opt_tdma.h
 TDMA_TXRATE_11NA_DEFAULT	opt_tdma.h
 TDMA_TXRATE_11NG_DEFAULT	opt_tdma.h
 
-# Virtualize the network stack
+# Network stack virtualization options
 VIMAGE			opt_global.h
+VNET_DEBUG		opt_global.h
 
 # Common Flash Interface (CFI) options
 CFI_SUPPORT_STRATAFLASH	opt_cfi.h

Modified: head/sys/net/vnet.h
==============================================================================
--- head/sys/net/vnet.h	Fri Aug 14 21:50:47 2009	(r196227)
+++ head/sys/net/vnet.h	Fri Aug 14 22:41:39 2009	(r196228)
@@ -107,9 +107,6 @@ void	vnet_destroy(struct vnet *vnet);
  * Various macros -- get and set the current network stack, but also
  * assertions.
  */
-#ifdef INVARIANTS
-#define	VNET_DEBUG
-#endif
 #ifdef VNET_DEBUG
 #define	VNET_ASSERT(condition)						\
 	if (!(condition)) {						\