diff options
| author | bz <bz@FreeBSD.org> | 2010-04-29 11:52:42 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2010-04-29 11:52:42 +0000 |
| commit | 0a90ef17283bc848eee90c3bdd5bec3fcc1bc879 (patch) | |
| tree | e6f9695e24617b291f2a8f0b1f388eda2e605549 /sys/contrib | |
| parent | 043deeb56455e1129861bf93ec57f03b90200344 (diff) | |
| download | FreeBSD-src-0a90ef17283bc848eee90c3bdd5bec3fcc1bc879.zip FreeBSD-src-0a90ef17283bc848eee90c3bdd5bec3fcc1bc879.tar.gz | |
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
MFC after: 6 days
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_auth.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_auth.c b/sys/contrib/ipfilter/netinet/ip_auth.c index 19a12f4..42d29d4 100644 --- a/sys/contrib/ipfilter/netinet/ip_auth.c +++ b/sys/contrib/ipfilter/netinet/ip_auth.c @@ -70,11 +70,6 @@ struct file; #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> -#if !defined(_KERNEL) && defined(__FreeBSD_version) && \ - __FreeBSD_version >= 800049 -# define V_ip_do_randomid ip_do_randomid -# define V_ip_id ip_id -#endif #if !defined(_KERNEL) && !defined(__osf__) && !defined(__sgi) # define KERNEL # define _KERNEL |
