summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzec <zec@FreeBSD.org>2009-08-14 22:41:39 +0000
committerzec <zec@FreeBSD.org>2009-08-14 22:41:39 +0000
commitb464f1dafc0e6b57446512ebbb01e4179aec9afb (patch)
tree8a4d2026e6f5fa71650c332ede6502997250c823
parentbf6acf798532962c108b5e0944b855cf7cfb5ff8 (diff)
downloadFreeBSD-src-b464f1dafc0e6b57446512ebbb01e4179aec9afb.zip
FreeBSD-src-b464f1dafc0e6b57446512ebbb01e4179aec9afb.tar.gz
Make VNET_DEBUG a standalone compile-time option, i.e. decouple it from
INVARIANTS. Reviewed by: bz Approved by: re (rwatson), julian (mentor)
-rw-r--r--sys/conf/options3
-rw-r--r--sys/net/vnet.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/conf/options b/sys/conf/options
index 41c80b5..ac2d87c 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -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
diff --git a/sys/net/vnet.h b/sys/net/vnet.h
index 91de07a..116d7af 100644
--- a/sys/net/vnet.h
+++ b/sys/net/vnet.h
@@ -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)) { \
OpenPOWER on IntegriCloud