diff options
| author | zec <zec@FreeBSD.org> | 2008-11-26 22:32:07 +0000 |
|---|---|---|
| committer | zec <zec@FreeBSD.org> | 2008-11-26 22:32:07 +0000 |
| commit | 95a15f5c8435d206ae030c1ed698f4fca6afdeae (patch) | |
| tree | 92dfba43d59635c80de0299501512e8472dbe130 /sys/netinet6/nd6_rtr.c | |
| parent | 7beb3e535d23cc0fe9278167a9c3dc67220250fd (diff) | |
| download | FreeBSD-src-95a15f5c8435d206ae030c1ed698f4fca6afdeae.zip FreeBSD-src-95a15f5c8435d206ae030c1ed698f4fca6afdeae.tar.gz | |
Merge more of currently non-functional (i.e. resolving to
whitespace) macros from p4/vimage branch.
Do a better job at enclosing all instantiations of globals
scheduled for virtualization in #ifdef VIMAGE_GLOBALS blocks.
De-virtualize and mark as const saorder_state_alive and
saorder_state_any arrays from ipsec code, given that they are never
updated at runtime, so virtualizing them would be pointless.
Reviewed by: bz, julian
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
Diffstat (limited to 'sys/netinet6/nd6_rtr.c')
| -rw-r--r-- | sys/netinet6/nd6_rtr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 31f06a7..200f1f4 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -85,9 +85,9 @@ static void in6_init_address_ltimes __P((struct nd_prefix *, static int rt6_deleteroute(struct radix_node *, void *); +#ifdef VIMAGE_GLOBALS extern int nd6_recalc_reachtm_interval; -#ifdef VIMAGE_GLOBALS static struct ifnet *nd6_defifp; int nd6_defifindex; |
