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_var.h | |
| 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_var.h')
| -rw-r--r-- | sys/netinet6/in6_var.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index d0a54e0..00342fd 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -487,12 +487,7 @@ struct in6_rrenumreq { #ifdef _KERNEL VNET_DECLARE(struct in6_ifaddrhead, in6_ifaddrhead); -VNET_DECLARE(struct icmp6stat, icmp6stat); -VNET_DECLARE(unsigned long, in6_maxmtu); - #define V_in6_ifaddrhead VNET(in6_ifaddrhead) -#define V_icmp6stat VNET(icmp6stat) -#define V_in6_maxmtu VNET(in6_maxmtu) extern struct rwlock in6_ifaddr_lock; #define IN6_IFADDR_LOCK_ASSERT( ) rw_assert(&in6_ifaddr_lock, RA_LOCKED) @@ -503,6 +498,8 @@ extern struct rwlock in6_ifaddr_lock; #define IN6_IFADDR_WLOCK_ASSERT() rw_assert(&in6_ifaddr_lock, RA_WLOCKED) #define IN6_IFADDR_WUNLOCK() rw_wunlock(&in6_ifaddr_lock) +VNET_DECLARE(struct icmp6stat, icmp6stat); +#define V_icmp6stat VNET(icmp6stat) #define in6_ifstat_inc(ifp, tag) \ do { \ if (ifp) \ @@ -511,6 +508,8 @@ do { \ extern struct in6_addr zeroin6_addr; extern u_char inet6ctlerrmap[]; +VNET_DECLARE(unsigned long, in6_maxmtu); +#define V_in6_maxmtu VNET(in6_maxmtu) #endif /* _KERNEL */ /* |
