diff options
| author | bz <bz@FreeBSD.org> | 2010-05-06 06:44:19 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2010-05-06 06:44:19 +0000 |
| commit | 70e6f14e44387c54e20403484badf917d9b74589 (patch) | |
| tree | 5305eacadb412df61b0d8de24da9051c2210f495 /sys/netinet6/in6_ifattach.c | |
| parent | 3e52c1f894aa8fc2b8031ef275b1fb830a25bb6f (diff) | |
| download | FreeBSD-src-70e6f14e44387c54e20403484badf917d9b74589.zip FreeBSD-src-70e6f14e44387c54e20403484badf917d9b74589.tar.gz | |
MFC r207369:
MFP4: @176978-176982, 176984, 176990-176994, 177441
"Whitspace" churn after the VIMAGE/VNET whirls.
Remove the need for some "init" functions within the network
stack, like pim6_init(), icmp_init() or significantly shorten
others like ip6_init() and nd6_init(), using static initialization
again where possible and formerly missed.
Move (most) variables back to the place they used to be before the
container structs and VIMAGE_GLOABLS (before r185088) and try to
reduce the diff to stable/7 and earlier as good as possible,
to help out-of-tree consumers to update from 6.x or 7.x to 8 or 9.
This also removes some header file pollution for putatively
static global variables.
Revert VIMAGE specific changes in ipfilter::ip_auth.c, that are
no longer needed.
Reviewed by: jhb
Discussed with: rwatson
Sponsored by: The FreeBSD Foundation
Sponsored by: CK Software GmbH
Diffstat (limited to 'sys/netinet6/in6_ifattach.c')
| -rw-r--r-- | sys/netinet6/in6_ifattach.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 6f9f11d..352b392 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -67,10 +67,15 @@ __FBSDID("$FreeBSD$"); #include <netinet6/mld6_var.h> #include <netinet6/scope6_var.h> -VNET_DEFINE(unsigned long, in6_maxmtu); -VNET_DEFINE(int, ip6_auto_linklocal); -VNET_DEFINE(struct callout, in6_tmpaddrtimer_ch); +VNET_DEFINE(unsigned long, in6_maxmtu) = 0; + +#ifdef IP6_AUTO_LINKLOCAL +VNET_DEFINE(int, ip6_auto_linklocal) = IP6_AUTO_LINKLOCAL; +#else +VNET_DEFINE(int, ip6_auto_linklocal) = 1; /* enabled by default */ +#endif +VNET_DEFINE(struct callout, in6_tmpaddrtimer_ch); #define V_in6_tmpaddrtimer_ch VNET(in6_tmpaddrtimer_ch) VNET_DECLARE(struct inpcbinfo, ripcbinfo); |
