1 files changed, 36 insertions, 20 deletions

diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h
index 0730d84..f54e02e 100644
--- a/sys/netinet6/nd6.h
+++ b/sys/netinet6/nd6.h
@@ -318,28 +318,44 @@ struct nd_pfxrouter {
 LIST_HEAD(nd_prhead, nd_prefix);
 
 /* nd6.c */
-#ifdef VIMAGE_GLOBALS
-extern int nd6_prune;
-extern int nd6_delay;
-extern int nd6_umaxtries;
-extern int nd6_mmaxtries;
-extern int nd6_useloopback;
-extern int nd6_maxnudhint;
-extern int nd6_gctimer;
-extern struct nd_drhead nd_defrouter;
-extern struct nd_prhead nd_prefix;
-extern int nd6_debug;
-extern int nd6_onlink_ns_rfc4861;
-
-extern struct callout nd6_timer_ch;
+VNET_DECLARE(int, nd6_prune);
+VNET_DECLARE(int, nd6_delay);
+VNET_DECLARE(int, nd6_umaxtries);
+VNET_DECLARE(int, nd6_mmaxtries);
+VNET_DECLARE(int, nd6_useloopback);
+VNET_DECLARE(int, nd6_maxnudhint);
+VNET_DECLARE(int, nd6_gctimer);
+VNET_DECLARE(struct nd_drhead, nd_defrouter);
+VNET_DECLARE(struct nd_prhead, nd_prefix);
+VNET_DECLARE(int, nd6_debug);
+VNET_DECLARE(int, nd6_onlink_ns_rfc4861);
+VNET_DECLARE(struct callout, nd6_timer_ch);
+
+#define	V_nd6_prune			VNET_GET(nd6_prune)
+#define	V_nd6_delay			VNET_GET(nd6_delay)
+#define	V_nd6_umaxtries			VNET_GET(nd6_umaxtries)
+#define	V_nd6_mmaxtries			VNET_GET(nd6_mmaxtries)
+#define	V_nd6_useloopback		VNET_GET(nd6_useloopback)
+#define	V_nd6_maxnudhint		VNET_GET(nd6_maxnudhint)
+#define	V_nd6_gctimer			VNET_GET(nd6_gctimer)
+#define	V_nd_defrouter			VNET_GET(nd_defrouter)
+#define	V_nd_prefix			VNET_GET(nd_prefix)
+#define	V_nd6_debug			VNET_GET(nd6_debug)
+#define	V_nd6_onlink_ns_rfc4861		VNET_GET(nd6_onlink_ns_rfc4861)
+#define	V_nd6_timer_ch			VNET_GET(nd6_timer_ch)
 
 /* nd6_rtr.c */
-extern int nd6_defifindex;
-extern int ip6_desync_factor;	/* seconds */
-extern u_int32_t ip6_temp_preferred_lifetime; /* seconds */
-extern u_int32_t ip6_temp_valid_lifetime; /* seconds */
-extern int ip6_temp_regen_advance; /* seconds */
-#endif /* VIMAGE_GLOBALS */
+VNET_DECLARE(int, nd6_defifindex);
+VNET_DECLARE(int, ip6_desync_factor);	/* seconds */
+VNET_DECLARE(u_int32_t, ip6_temp_preferred_lifetime); /* seconds */
+VNET_DECLARE(u_int32_t, ip6_temp_valid_lifetime); /* seconds */
+VNET_DECLARE(int, ip6_temp_regen_advance); /* seconds */
+
+#define	V_nd6_defifindex		VNET_GET(nd6_defifindex)
+#define	V_ip6_desync_factor		VNET_GET(ip6_desync_factor)
+#define	V_ip6_temp_preferred_lifetime	VNET_GET(ip6_temp_preferred_lifetime)
+#define	V_ip6_temp_valid_lifetime	VNET_GET(ip6_temp_valid_lifetime)
+#define	V_ip6_temp_regen_advance	VNET_GET(ip6_temp_regen_advance)
 
 #define nd6log(x)	do { if (V_nd6_debug) log x; } while (/*CONSTCOND*/ 0)