diff options
| author | Marko Zec <zec@FreeBSD.org> | 2008-11-28 23:30:51 +0000 |
|---|---|---|
| committer | Marko Zec <zec@FreeBSD.org> | 2008-11-28 23:30:51 +0000 |
| commit | f02493cbbd6e5e5f9094dc7ef872f773fa8b1a11 (patch) | |
| tree | bb923196c85b9e71d363a7650c292edddfbc6beb /sys/contrib | |
| parent | 39a7471508a20f2b15ca3bee3e532de069483811 (diff) | |
| download | src-f02493cbbd6e5e5f9094dc7ef872f773fa8b1a11.tar.gz src-f02493cbbd6e5e5f9094dc7ef872f773fa8b1a11.zip | |
Unhide declarations of network stack virtualization structs from
underneath #ifdef VIMAGE blocks.
This change introduces some churn in #include ordering and nesting
throughout the network stack and drivers but is not expected to cause
any additional issues.
In the next step this will allow us to instantiate the virtualization
container structures and switch from using global variables to their
"containerized" counterparts.
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
Notes
Notes:
svn path=/head/; revision=185419
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_fil_freebsd.c | 2 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/mlfk_ipl.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c index 7bfd1de3e79f..f0604b090a3b 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c @@ -121,7 +121,7 @@ static const char rcsid[] = "@(#)$Id: ip_fil_freebsd.c,v 2.53.2.50 2007/09/20 12 #endif extern int ip_optcopy __P((struct ip *, struct ip *)); -#if (__FreeBSD_version > 460000) +#if (__FreeBSD_version > 460000) && (__FreeBSD_version < 800055) extern int path_mtu_discovery; #endif diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/contrib/ipfilter/netinet/mlfk_ipl.c index 36048e4bb067..0b462d9436c8 100644 --- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c +++ b/sys/contrib/ipfilter/netinet/mlfk_ipl.c @@ -43,7 +43,9 @@ static int sysctl_ipf_int ( SYSCTL_HANDLER_ARGS ); static int ipf_modload(void); static int ipf_modunload(void); +#if __FreeBSD_version < 800055 SYSCTL_DECL(_net_inet); +#endif #define SYSCTL_IPF(parent, nbr, name, access, ptr, val, descr) \ SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \ ptr, val, sysctl_ipf_int, "I", descr); |