diff options
| author | bz <bz@FreeBSD.org> | 2008-12-11 16:26:38 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2008-12-11 16:26:38 +0000 |
| commit | 83a32f8750135cc82be5727b54cb42797923009b (patch) | |
| tree | 969ea1192ccca86b51199d256a5beea929f92162 /sys/netinet6/nd6.h | |
| parent | 83955c51afc9c7fd1b9b5164cbbbf65f1706262b (diff) | |
| download | FreeBSD-src-83a32f8750135cc82be5727b54cb42797923009b.zip FreeBSD-src-83a32f8750135cc82be5727b54cb42797923009b.tar.gz | |
Put a global variables, which were virtualized but formerly
missed under VIMAGE_GLOBAL.
Start putting 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.
While there garbage collect a few dead externs from ip6_var.h.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/netinet6/nd6.h')
| -rw-r--r-- | sys/netinet6/nd6.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index 4b4d6ec..4d3c06b 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -328,6 +328,7 @@ 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; @@ -341,8 +342,6 @@ extern struct nd_prhead nd_prefix; extern int nd6_debug; extern int nd6_onlink_ns_rfc4861; -#define nd6log(x) do { if (V_nd6_debug) log x; } while (/*CONSTCOND*/ 0) - extern struct callout nd6_timer_ch; /* nd6_rtr.c */ @@ -351,6 +350,9 @@ 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 */ + +#define nd6log(x) do { if (V_nd6_debug) log x; } while (/*CONSTCOND*/ 0) union nd_opts { struct nd_opt_hdr *nd_opt_array[8]; /* max = target address list */ |
