From owner-svn-src-all@FreeBSD.ORG  Fri Aug 14 22:41:39 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8E6A61065672;
	Fri, 14 Aug 2009 22:41:39 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E14E8FC59;
	Fri, 14 Aug 2009 22:41:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7EMfdsU050066;
	Fri, 14 Aug 2009 22:41:39 GMT (envelope-from zec@svn.freebsd.org)
Received: (from zec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7EMfdw1050063;
	Fri, 14 Aug 2009 22:41:39 GMT (envelope-from zec@svn.freebsd.org)
Message-Id: <200908142241.n7EMfdw1050063@svn.freebsd.org>
From: Marko Zec <zec@FreeBSD.org>
Date: Fri, 14 Aug 2009 22:41:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196228 - in head/sys: conf net
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Aug 2009 22:41:39 -0000

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)) {						\