svn commit: r191734 - in head/sys: net netinet

[Marko Zec]

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;