summaryrefslogtreecommitdiffstats
path: root/sys/netinet6/ip6_input.c
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2008-12-13 19:13:03 +0000
committerbz <bz@FreeBSD.org>2008-12-13 19:13:03 +0000
commit98e7fe0e6a4b7ee298fffadcf232867ffeecbad6 (patch)
tree000c543641151e45c9fe34f2fa0d6c678def8f4c /sys/netinet6/ip6_input.c
parent03bced1c702a5a7827ac78973cb39290752dbfcc (diff)
downloadFreeBSD-src-98e7fe0e6a4b7ee298fffadcf232867ffeecbad6.zip
FreeBSD-src-98e7fe0e6a4b7ee298fffadcf232867ffeecbad6.tar.gz
Second round of putting global variables, which were virtualized
but formerly missed under VIMAGE_GLOBAL. Put the extern declarations of the virtualized globals under VIMAGE_GLOBAL as the globals themsevles are already. This will help by the time when we are going to remove the globals entirely. Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/netinet6/ip6_input.c')
-rw-r--r--sys/netinet6/ip6_input.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 7edcaa3..0c259e3 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -130,7 +130,6 @@ struct vnet_inet6 vnet_inet6_0;
static int ip6qmaxlen;
struct in6_ifaddr *in6_ifaddr;
struct ip6stat ip6stat;
-#endif
extern struct callout in6_tmpaddrtimer_ch;
@@ -144,7 +143,8 @@ extern int icmp6_nodeinfo;
extern int udp6_sendspace;
extern int udp6_recvspace;
-#ifdef VIMAGE_GLOBALS
+extern struct route_in6 ip6_forward_rt;
+
int ip6_forward_srcrt; /* XXX */
int ip6_sourcecheck; /* XXX */
int ip6_sourcecheck_interval; /* XXX */
@@ -301,8 +301,6 @@ ip6_init2(void *dummy)
/* This must be after route_init(), which is now SI_ORDER_THIRD */
SYSINIT(netinet6init2, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE, ip6_init2, NULL);
-extern struct route_in6 ip6_forward_rt;
-
void
ip6_input(struct mbuf *m)
{
OpenPOWER on IntegriCloud