Date: Thu, 12 Jun 2008 02:12:54 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 143340 for review Message-ID: <200806120212.m5C2Cs7F040618@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=143340 Change 143340 by julian@julian_trafmon1 on 2008/06/12 02:12:41 Bunch of stuff we missed Affected files ... .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#4 edit .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#2 edit .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sockio.c#3 edit .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_stat.c#2 edit .. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_subr.c#2 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/fil.c#2 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_state.c#2 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#4 (text+ko) ==== @@ -126,7 +126,6 @@ int linux_sysinfo(struct thread *td, struct linux_sysinfo_args *args) { - INIT_VPROCG(TD_TO_VPROCG(td)); struct l_sysinfo sysinfo; vm_object_t object; int i, j; ==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#2 (text+ko) ==== @@ -50,7 +50,11 @@ #include <sys/uio.h> #include <sys/syslog.h> #include <sys/un.h> +#ifndef KLD_MODULE +#include <sys/vimage.h> +#endif + #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> @@ -588,7 +592,7 @@ * XXX: Avoid undefined symbol error with an IPv4 only * kernel. */ - && ip6_v6only + && V_ip6_v6only #endif ) { int v6only; ==== //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sockio.c#3 (text+ko) ==== @@ -29,6 +29,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); +#include "opt_vimage.h + #include <sys/param.h> #include <sys/proc.h> #include <sys/systm.h> @@ -36,9 +38,10 @@ #include <sys/filedesc.h> #include <sys/sockio.h> #include <sys/socket.h> +#include <sys/vimage.h> + #include <net/if.h> - #include <compat/svr4/svr4.h> #include <compat/svr4/svr4_util.h> #include <compat/svr4/svr4_ioctl.h> @@ -103,7 +106,7 @@ * entry per physical interface? */ IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) + TAILQ_FOREACH(ifp, &V_ifnet, if_link) if (TAILQ_EMPTY(&ifp->if_addrhead)) ifnum++; else ==== //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_stat.c#2 (text+ko) ==== @@ -43,6 +43,7 @@ #include <sys/sysctl.h> #include <sys/sysproto.h> #include <sys/un.h> +#include <sys/vimage.h> #include <vm/vm.h> @@ -426,7 +427,7 @@ break; case SVR4_SI_HOSTNAME: - str = hostname; + str = V_hostname; break; case SVR4_SI_RELEASE: @@ -454,7 +455,7 @@ break; case SVR4_SI_SRPC_DOMAIN: - str = domainname; + str = V_domainname; break; case SVR4_SI_PLATFORM: ==== //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_subr.c#2 (text+ko) ==== @@ -32,6 +32,7 @@ #if (__FreeBSD__ != 2) #include "opt_inet.h" #ifdef __FreeBSD__ +#include "opt_vimage.h" #include "opt_inet6.h" #endif #endif @@ -77,6 +78,7 @@ #include <sys/bus.h> #include <sys/cpu.h> #include <sys/eventhandler.h> +#include <sys/vimage.h> #include <machine/clock.h> #endif #if defined(__i386__) @@ -460,7 +462,7 @@ #if defined(__FreeBSD__) && (__FreeBSD_version >= 500000) IFNET_RLOCK(); #endif - for (ifp = TAILQ_FIRST(&ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) { + for (ifp = TAILQ_FIRST(&V_ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) { /* read from if_snd unlocked */ if (!TBR_IS_ENABLED(&ifp->if_snd)) continue; ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/fil.c#2 (text+ko) ==== @@ -28,7 +28,9 @@ (__FreeBSD_version >= 220000) # if (__FreeBSD_version >= 400000) # if !defined(IPFILTER_LKM) +# include "opt_vimage.h" # include "opt_inet6.h" +# include <sys/vimage.h> # endif # if (__FreeBSD_version == 400019) # define CSUM_DELAY_DATA ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 (text+ko) ==== @@ -54,7 +54,9 @@ #endif #if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802) || \ (defined(__FreeBSD_version) &&(__FreeBSD_version >= 400000)) +# include "opt_vimage.h" # include <sys/queue.h> +# include <sys/vimage.h> #endif #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi) # include <machine/cpu.h> ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 (text+ko) ==== @@ -19,11 +19,16 @@ #if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \ !defined(KLD_MODULE) && !defined(IPFILTER_LKM) # include "opt_inet6.h" +# include "opt_vimage.h" #endif #if defined(__FreeBSD_version) && (__FreeBSD_version >= 440000) && \ !defined(KLD_MODULE) && !defined(IPFILTER_LKM) # include "opt_random_ip_id.h" #endif +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) && \ + !defined(KLD_MODULE) && !defined(IPFILTER_LKM) +# include "opt_vimage.h" +#endif #include <sys/param.h> #if defined(__FreeBSD__) && !defined(__FreeBSD_version) # if defined(IPFILTER_LKM) @@ -62,6 +67,12 @@ #else # include <sys/select.h> #endif +#if __FreeBSD_version >= 800000 +# include <sys/vimage.h> +#else +#define V_path_mtu_discovery path_mtu_discovery +#define V_ipforwarding ipforwarding +#endif #include <net/if.h> #if __FreeBSD_version >= 300000 @@ -234,7 +245,7 @@ fr_running = 1; if (fr_control_forwarding & 1) - ipforwarding = 1; + V_ipforwarding = 1; SPL_X(s); #if (__FreeBSD_version >= 300000) @@ -257,7 +268,7 @@ int s; #endif if (fr_control_forwarding & 2) - ipforwarding = 0; + V_ipforwarding = 0; SPL_NET(s); @@ -652,7 +663,7 @@ ip->ip_tos = oip->ip_tos; ip->ip_id = fin->fin_ip->ip_id; #if (__FreeBSD_version > 460000) - ip->ip_off = path_mtu_discovery ? IP_DF : 0; + ip->ip_off = V_path_mtu_discovery ? IP_DF : 0; #else ip->ip_off = 0; #endif ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 (text+ko) ==== @@ -86,6 +86,10 @@ # ifndef IPFILTER_LKM # include <sys/libkern.h> # include <sys/systm.h> +# if (__FreeBSD_version > 800000) +# include "opt_vimage.h" +# include <sys/vimage.h> +# endif # endif extern struct callout_handle fr_slowtimer_ch; # endif ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 (text+ko) ==== @@ -49,6 +49,10 @@ #if defined(_KERNEL) && (__FreeBSD_version >= 220000) # include <sys/filio.h> # include <sys/fcntl.h> +# if (__FreeBSD_version > 800000) +# include "opt_vimage.h" +# include <sys/vimage.h> +# endif # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_state.c#2 (text+ko) ==== @@ -44,6 +44,10 @@ # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif +# if (__FreeBSD_version > 800000) +# include "opt_vimage.h" +# include <sys/vimage.h> +# endif #else # include <sys/ioctl.h> #endif ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 (text+ko) ==== @@ -42,6 +42,10 @@ # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif +# if (__FreeBSD_version > 800000) +# include "opt_vimage.h" +# include <sys/vimage.h> +# endif #else # include <sys/ioctl.h> #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806120212.m5C2Cs7F040618>