summaryrefslogtreecommitdiffstats
path: root/sys/net/route.c
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2009-06-22 15:07:12 +0000
committerbz <bz@FreeBSD.org>2009-06-22 15:07:12 +0000
commit425e742e5927cf7a386fed53bb14943750dcb734 (patch)
tree90da8ea72aab09e3ece9fae3a7628931fe9ff0a0 /sys/net/route.c
parentce1f4c0ee481496675b4ae8cf80af2a542e64392 (diff)
downloadFreeBSD-src-425e742e5927cf7a386fed53bb14943750dcb734.zip
FreeBSD-src-425e742e5927cf7a386fed53bb14943750dcb734.tar.gz
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]
Diffstat (limited to 'sys/net/route.c')
-rw-r--r--sys/net/route.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/sys/net/route.c b/sys/net/route.c
index 2ebdeaa..2a15a41 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -90,10 +90,10 @@ SYSCTL_INT(_net, OID_AUTO, add_addr_allfibs, CTLFLAG_RW,
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_modinfo = {
*/
#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;
OpenPOWER on IntegriCloud