From owner-svn-src-head@FreeBSD.ORG  Mon Jun 22 15:07:12 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 98711106564A;
	Mon, 22 Jun 2009 15:07:12 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 86B728FC08;
	Mon, 22 Jun 2009 15:07:12 +0000 (UTC) (envelope-from bz@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 n5MF7CCu044462;
	Mon, 22 Jun 2009 15:07:12 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5MF7CIq044459;
	Mon, 22 Jun 2009 15:07:12 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200906221507.n5MF7CIq044459@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Mon, 22 Jun 2009 15:07:12 +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: r194629 - head/sys/net
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Jun 2009 15:07:13 -0000

Author: bz
Date: Mon Jun 22 15:07:12 2009
New Revision: 194629
URL: http://svn.freebsd.org/changeset/base/194629

Log:
  Collect all VIMAGE_GLOBALS variables in one place.
  
  No longer export rt_tables as all lookups go through
  rt_tables_get_rnh().
  
  We cannot make rt_tables (and rtstat, rttrash[1]) static as
  netstat -r (-rs[1]) would stop working on a stripped
  VIMAGE_GLOBALS kernel.
  
  Reviewed by:		zec
  Presumably broken by:	phk 13.5y ago in r12820 [1]

Modified:
  head/sys/net/route.c
  head/sys/net/route.h

Modified: head/sys/net/route.c
==============================================================================
--- head/sys/net/route.c	Mon Jun 22 15:00:15 2009	(r194628)
+++ head/sys/net/route.c	Mon Jun 22 15:07:12 2009	(r194629)
@@ -90,10 +90,10 @@ SYSCTL_INT(_net, OID_AUTO, add_addr_allf
 TUNABLE_INT("net.add_addr_allfibs", &rt_add_addr_allfibs);
 
 #ifdef VIMAGE_GLOBALS
-static struct rtstat rtstat;
-struct radix_node_head *rt_tables;
-
-static int	rttrash;		/* routes not in table but not freed */
+struct radix_node_head	*rt_tables;
+static uma_zone_t	rtzone;		/* Routing table UMA zone. */
+int			rttrash;	/* routes not in table but not freed */
+struct rtstat		rtstat;
 #endif
 
 static void rt_maskedcopy(struct sockaddr *,
@@ -129,10 +129,6 @@ static const vnet_modinfo_t vnet_rtable_
  */
 #define RNTORT(p)	((struct rtentry *)(p))
 
-#ifdef VIMAGE_GLOBALS
-static uma_zone_t rtzone;		/* Routing table UMA zone. */
-#endif
-
 #if 0
 /* default fib for tunnels to use */
 u_int tunnel_fib = 0;

Modified: head/sys/net/route.h
==============================================================================
--- head/sys/net/route.h	Mon Jun 22 15:00:15 2009	(r194628)
+++ head/sys/net/route.h	Mon Jun 22 15:07:12 2009	(r194629)
@@ -373,7 +373,6 @@ struct rt_addrinfo {
 	}							\
 } while (0)
 
-extern struct radix_node_head *rt_tables;
 struct radix_node_head *rt_tables_get_rnh(int, int);
 
 struct ifmultiaddr;