From owner-svn-src-all@FreeBSD.ORG  Sat May  2 05:02:30 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 DEE261065674;
	Sat,  2 May 2009 05:02:29 +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 CCD4C8FC08;
	Sat,  2 May 2009 05:02:29 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4252SAD070233;
	Sat, 2 May 2009 05:02:28 GMT (envelope-from zec@svn.freebsd.org)
Received: (from zec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4252Ssc070230;
	Sat, 2 May 2009 05:02:28 GMT (envelope-from zec@svn.freebsd.org)
Message-Id: <200905020502.n4252Ssc070230@svn.freebsd.org>
From: Marko Zec <zec@FreeBSD.org>
Date: Sat, 2 May 2009 05:02:28 +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: r191734 - in head/sys: net netinet
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: Sat, 02 May 2009 05:02:31 -0000

Author: zec
Date: Sat May  2 05:02:28 2009
New Revision: 191734
URL: http://svn.freebsd.org/changeset/base/191734

Log:
  Unbreak options VIMAGE + nooptions INVARIANTS kernel builds.
  
  Submitted by:	julian
  Approved by:	julian (mentor)

Modified:
  head/sys/net/route.c
  head/sys/netinet/igmp.c
  head/sys/netinet/tcp_timewait.c

Modified: head/sys/net/route.c
==============================================================================
--- head/sys/net/route.c	Fri May  1 21:43:04 2009	(r191733)
+++ head/sys/net/route.c	Sat May  2 05:02:28 2009	(r191734)
@@ -1131,10 +1131,10 @@ bad:
 int
 rt_setgate(struct rtentry *rt, struct sockaddr *dst, struct sockaddr *gate)
 {
-	INIT_VNET_NET(curvnet);
 	/* XXX dst may be overwritten, can we move this to below */
 	int dlen = SA_SIZE(dst), glen = SA_SIZE(gate);
 #ifdef INVARIANTS
+	INIT_VNET_NET(curvnet);
 	struct radix_node_head *rnh =
 	    V_rt_tables[rt->rt_fibnum][dst->sa_family];
 #endif

Modified: head/sys/netinet/igmp.c
==============================================================================
--- head/sys/netinet/igmp.c	Fri May  1 21:43:04 2009	(r191733)
+++ head/sys/netinet/igmp.c	Sat May  2 05:02:28 2009	(r191734)
@@ -3617,7 +3617,9 @@ vnet_igmp_iattach(const void *unused __u
 static int
 vnet_igmp_idetach(const void *unused __unused)
 {
+#ifdef INVARIANTS
 	INIT_VNET_INET(curvnet);
+#endif
 
 	CTR1(KTR_IGMPV3, "%s: tearing down", __func__);
 

Modified: head/sys/netinet/tcp_timewait.c
==============================================================================
--- head/sys/netinet/tcp_timewait.c	Fri May  1 21:43:04 2009	(r191733)
+++ head/sys/netinet/tcp_timewait.c	Sat May  2 05:02:28 2009	(r191734)
@@ -188,9 +188,7 @@ tcp_tw_init(void)
 void
 tcp_twstart(struct tcpcb *tp)
 {
-#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
 	INIT_VNET_INET(tp->t_vnet);
-#endif
 	struct tcptw *tw;
 	struct inpcb *inp = tp->t_inpcb;
 	int acknow;