Date: Wed, 8 Oct 2008 17:50:14 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 151144 for review Message-ID: <200810081750.m98HoEfQ074216@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=151144 Change 151144 by zec@zec_tca51 on 2008/10/08 17:49:55 Further reduce diff against head. Affected files ... .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#26 edit .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#15 edit .. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#13 edit .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#9 edit .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#8 edit .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#11 edit .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#18 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#12 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#19 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#10 edit .. //depot/projects/vimage/src/sys/contrib/rdma/rdma_cma.c#6 edit .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#8 edit .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#16 edit .. //depot/projects/vimage/src/sys/kern/init_main.c#23 edit .. //depot/projects/vimage/src/sys/kern/kern_exit.c#24 edit .. //depot/projects/vimage/src/sys/kern/kern_linker.c#18 edit .. //depot/projects/vimage/src/sys/kern/kern_poll.c#11 edit .. //depot/projects/vimage/src/sys/kern/kern_synch.c#23 edit .. //depot/projects/vimage/src/sys/kern/kern_uuid.c#11 edit .. //depot/projects/vimage/src/sys/kern/sys_socket.c#14 edit .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#25 edit .. //depot/projects/vimage/src/sys/net/bridgestp.c#16 edit .. //depot/projects/vimage/src/sys/net/if.c#43 edit .. //depot/projects/vimage/src/sys/net/if_bridge.c#21 edit .. //depot/projects/vimage/src/sys/net/if_clone.c#12 edit .. //depot/projects/vimage/src/sys/net/if_ef.c#10 edit .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#28 edit .. //depot/projects/vimage/src/sys/net/if_faith.c#7 edit .. //depot/projects/vimage/src/sys/net/if_gif.c#18 edit .. //depot/projects/vimage/src/sys/net/if_gre.c#11 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#28 edit .. //depot/projects/vimage/src/sys/net/if_ppp.c#10 edit .. //depot/projects/vimage/src/sys/net/if_spppsubr.c#12 edit .. //depot/projects/vimage/src/sys/net/if_tap.c#10 edit .. //depot/projects/vimage/src/sys/net/if_var.h#19 edit .. //depot/projects/vimage/src/sys/net/netisr.c#12 edit .. //depot/projects/vimage/src/sys/net/route.c#30 edit .. //depot/projects/vimage/src/sys/net/rtsock.c#19 edit .. //depot/projects/vimage/src/sys/net/vnet.h#15 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#22 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#13 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#15 edit .. //depot/projects/vimage/src/sys/netgraph/atm/ng_atm.c#9 edit .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#17 edit .. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#15 edit .. //depot/projects/vimage/src/sys/netgraph/ng_gif.c#10 edit .. //depot/projects/vimage/src/sys/netgraph/ng_pipe.c#9 edit .. //depot/projects/vimage/src/sys/netgraph/ng_pipe.h#4 edit .. //depot/projects/vimage/src/sys/netinet/accf_http.c#4 edit .. //depot/projects/vimage/src/sys/netinet/in_gif.c#14 edit .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#36 edit .. //depot/projects/vimage/src/sys/netinet/ip_carp.c#14 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#51 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#12 edit .. //depot/projects/vimage/src/sys/netinet/ip_id.c#7 edit .. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#15 edit .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#15 edit .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#32 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#28 edit .. //depot/projects/vimage/src/sys/netinet/tcp_offload.c#10 edit .. //depot/projects/vimage/src/sys/netinet/tcp_reass.c#9 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#17 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#19 edit .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#24 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#32 edit .. //depot/projects/vimage/src/sys/netinet6/dest6.c#10 edit .. //depot/projects/vimage/src/sys/netinet6/frag6.c#20 edit .. //depot/projects/vimage/src/sys/netinet6/in6_cksum.c#7 edit .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#15 edit .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#30 edit .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#25 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_forward.c#16 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#37 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_ipsec.c#14 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#34 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#23 edit .. //depot/projects/vimage/src/sys/netinet6/route6.c#11 edit .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#27 edit .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#22 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#18 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec_mbuf.c#8 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#19 edit .. //depot/projects/vimage/src/sys/netipsec/key.c#25 edit .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#15 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ah.c#17 edit .. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#17 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#14 edit .. //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#11 edit .. //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#12 edit .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#20 edit .. //depot/projects/vimage/src/sys/rpc/rpc.h#3 edit .. //depot/projects/vimage/src/sys/sys/sched.h#11 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#68 edit Differences ... ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#26 (text+ko) ==== @@ -39,8 +39,6 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ -#include "opt_compat.h" - #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.125 2008/10/04 14:08:16 kib Exp $"); @@ -77,7 +75,6 @@ #include <sys/vnode.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <vm/vm.h> ==== //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#15 (text+ko) ==== @@ -26,8 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_compat.h" - #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.144 2008/10/02 15:37:58 zec Exp $"); @@ -62,7 +60,6 @@ #include <sys/uio.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> ==== //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#13 (text+ko) ==== @@ -52,12 +52,9 @@ #include <sys/un.h> #include <sys/vimage.h> -#include <net/if.h> - #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> -#include <netinet6/vinet6.h> #ifdef INET6 #include <netinet/ip6.h> #include <netinet6/ip6_var.h> @@ -549,7 +546,7 @@ static int linux_socket(struct thread *td, struct linux_socket_args *args) { -#ifdef INET6 +#if defined(INET6) && !defined(KLD_MODULE) INIT_VNET_INET6(curvnet); #endif struct socket_args /* { @@ -585,7 +582,13 @@ * for Linux apps if the sysctl value is set to 1. */ if (bsd_args.domain == PF_INET6 && retval_socket >= 0 +#ifndef KLD_MODULE + /* + * XXX: Avoid undefined symbol error with an IPv4 only + * kernel. + */ && V_ip6_v6only +#endif ) { int v6only; ==== //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#9 (text+ko) ==== @@ -39,7 +39,6 @@ #include <sys/vimage.h> #include <net/if.h> -#include <net/vnet.h> #include <compat/svr4/svr4.h> #include <compat/svr4/svr4_util.h> ==== //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#8 (text+ko) ==== @@ -29,9 +29,9 @@ #if defined(__FreeBSD__) || defined(__NetBSD__) #include "opt_altq.h" +#include "opt_inet.h" #ifdef __FreeBSD__ #include "opt_inet6.h" -#include "opt_inet.h" #endif #endif /* __FreeBSD__ || __NetBSD__ */ @@ -47,12 +47,10 @@ #include <sys/syslog.h> #include <sys/sysctl.h> #include <sys/queue.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> -#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> ==== //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#11 (text+ko) ==== @@ -25,8 +25,6 @@ # include "opt_random_ip_id.h" #endif #include <sys/param.h> -#if __FreeBSD_version > 800000 -#endif #if defined(__FreeBSD__) && !defined(__FreeBSD_version) # if defined(IPFILTER_LKM) # ifndef __FreeBSD_cc_version @@ -125,7 +123,6 @@ #if __FreeBSD_version > 800000 # include <sys/vimage.h> -# include <netinet/vinet.h> #endif # ifdef IPFILTER_M_IPFILTER ==== //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#18 (text+ko) ==== @@ -120,7 +120,6 @@ #include <netinet/udp_var.h> #include <netinet/icmp_var.h> #include <netinet/if_ether.h> -#include <netinet/vinet.h> #ifndef __FreeBSD__ #include <dev/rndvar.h> @@ -140,7 +139,6 @@ #ifdef __FreeBSD__ #include <netinet6/ip6_var.h> #include <netinet6/in6_pcb.h> -#include <netinet6/vinet6.h> #endif #endif /* INET6 */ ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#12 (text+ko) ==== @@ -58,7 +58,6 @@ #include <net/if.h> #include <net/if_types.h> -#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_var.h> ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#19 (text+ko) ==== @@ -97,14 +97,11 @@ #ifndef __FreeBSD__ #include <sys/rwlock.h> #include <uvm/uvm_extern.h> -#else -#include <sys/vimage.h> #endif #include <net/if.h> #include <net/if_types.h> #include <net/route.h> -#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_var.h> ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#10 (text+ko) ==== @@ -65,7 +65,6 @@ #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> #include <netinet/if_ether.h> -#include <netinet/vinet.h> #include <net/pfvar.h> ==== //depot/projects/vimage/src/sys/contrib/rdma/rdma_cma.c#6 (text+ko) ==== @@ -51,7 +51,6 @@ #include <net/if.h> #include <netinet/in.h> #include <netinet/in_pcb.h> -#include <netinet/vinet.h> #include <contrib/rdma/rdma_cm.h> #include <contrib/rdma/ib_cache.h> ==== //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#8 (text+ko) ==== @@ -60,7 +60,6 @@ #define V_ifnet ifnet #endif -#include <net/vnet.h> #include <net/if.h> #include <net/if_var.h> ==== //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#16 (text+ko) ==== @@ -62,7 +62,6 @@ #include <net/if.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_pcb.h> #include <netinet/in_systm.h> ==== //depot/projects/vimage/src/sys/kern/init_main.c#23 (text+ko) ==== @@ -66,7 +66,6 @@ #include <sys/vnode.h> #include <sys/sysent.h> #include <sys/reboot.h> -#include <sys/refcount.h> #include <sys/sched.h> #include <sys/sx.h> #include <sys/sysproto.h> ==== //depot/projects/vimage/src/sys/kern/kern_exit.c#24 (text+ko) ==== @@ -41,7 +41,6 @@ #include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_mac.h" -#include "opt_sched.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage/src/sys/kern/kern_linker.c#18 (text+ko) ==== @@ -53,8 +53,6 @@ #include <sys/sysctl.h> #include <sys/vimage.h> -#include <net/vnet.h> - #include <security/mac/mac_framework.h> #include "linker_if.h" ==== //depot/projects/vimage/src/sys/kern/kern_poll.c#11 (text+ko) ==== @@ -41,7 +41,6 @@ #include <net/if.h> /* for IFF_* flags */ #include <net/netisr.h> /* for NETISR_POLL */ -#include <net/vnet.h> /* for ifnet pointer */ #include <sys/proc.h> #include <sys/resourcevar.h> ==== //depot/projects/vimage/src/sys/kern/kern_synch.c#23 (text+ko) ==== @@ -66,8 +66,6 @@ #include <machine/cpu.h> -#include <net/vnet.h> - static void synch_setup(void *dummy); SYSINIT(synch_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, synch_setup, NULL); ==== //depot/projects/vimage/src/sys/kern/kern_uuid.c#11 (text+ko) ==== @@ -39,7 +39,6 @@ #include <sys/uuid.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> ==== //depot/projects/vimage/src/sys/kern/sys_socket.c#14 (text+ko) ==== @@ -52,7 +52,6 @@ #include <sys/ucred.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/route.h> ==== //depot/projects/vimage/src/sys/kern/uipc_socket.c#25 (text+ko) ==== @@ -131,8 +131,6 @@ #include <sys/jail.h> #include <sys/vimage.h> -#include <net/vnet.h> - #include <security/mac/mac_framework.h> #include <vm/uma.h> ==== //depot/projects/vimage/src/sys/net/bridgestp.c#16 (text+ko) ==== @@ -49,6 +49,7 @@ #include <sys/lock.h> #include <sys/mutex.h> #include <sys/taskqueue.h> +#include <sys/vimage.h> #include <net/if.h> #include <net/if_dl.h> ==== //depot/projects/vimage/src/sys/net/if.c#43 (text+ko) ==== @@ -56,7 +56,7 @@ #include <sys/taskqueue.h> #include <sys/domain.h> #include <sys/jail.h> - +#include <sys/vimage.h> #include <machine/stdarg.h> #include <net/if.h> ==== //depot/projects/vimage/src/sys/net/if_bridge.c#21 (text+ko) ==== @@ -100,6 +100,7 @@ #include <sys/proc.h> #include <sys/lock.h> #include <sys/mutex.h> +#include <sys/vimage.h> #include <net/bpf.h> #include <net/if.h> @@ -3376,6 +3377,7 @@ bridge_fragment(struct ifnet *ifp, struct mbuf *m, struct ether_header *eh, int snap, struct llc *llc) { + INIT_VNET_INET(curvnet); struct mbuf *m0; struct ip *ip; int error = -1; @@ -3412,10 +3414,8 @@ m_freem(m); } - if (error == 0) { - INIT_VNET_INET(curvnet); + if (error == 0) V_ipstat.ips_fragmented++; - } return (error); ==== //depot/projects/vimage/src/sys/net/if_clone.c#12 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/if_ef.c#10 (text+ko) ==== @@ -39,6 +39,7 @@ #include <sys/syslog.h> #include <sys/kernel.h> #include <sys/module.h> +#include <sys/vimage.h> #include <net/ethernet.h> #include <net/if_llc.h> ==== //depot/projects/vimage/src/sys/net/if_ethersubr.c#28 (text+ko) ==== @@ -42,15 +42,14 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/lock.h> #include <sys/malloc.h> #include <sys/module.h> #include <sys/mbuf.h> #include <sys/random.h> -#include <sys/rwlock.h> #include <sys/socket.h> #include <sys/sockio.h> #include <sys/sysctl.h> +#include <sys/vimage.h> #include <net/if.h> #include <net/if_arp.h> ==== //depot/projects/vimage/src/sys/net/if_faith.c#7 (text+ko) ==== @@ -77,7 +77,6 @@ #include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> -#include <netinet6/vinet6.h> #endif #define FAITHNAME "faith" ==== //depot/projects/vimage/src/sys/net/if_gif.c#18 (text+ko) ==== @@ -50,7 +50,6 @@ #include <sys/protosw.h> #include <sys/conf.h> #include <sys/vimage.h> - #include <machine/cpu.h> #include <net/if.h> ==== //depot/projects/vimage/src/sys/net/if_gre.c#11 (text+ko) ==== @@ -64,7 +64,6 @@ #include <sys/sockio.h> #include <sys/sysctl.h> #include <sys/systm.h> -#include <sys/vimage.h> #include <net/ethernet.h> #include <net/if.h> @@ -73,7 +72,6 @@ #include <net/route.h> #ifdef INET -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/in_var.h> ==== //depot/projects/vimage/src/sys/net/if_loop.c#28 (text+ko) ==== @@ -42,7 +42,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/module.h> #include <machine/bus.h> ==== //depot/projects/vimage/src/sys/net/if_ppp.c#10 (text+ko) ==== @@ -98,7 +98,6 @@ #include <sys/time.h> #include <sys/malloc.h> #include <sys/module.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/if_clone.h> ==== //depot/projects/vimage/src/sys/net/if_spppsubr.c#12 (text+ko) ==== @@ -44,7 +44,6 @@ #include <net/netisr.h> #include <net/if_types.h> #include <net/route.h> - #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> ==== //depot/projects/vimage/src/sys/net/if_tap.c#10 (text+ko) ==== @@ -58,7 +58,6 @@ #include <sys/ttycom.h> #include <sys/uio.h> #include <sys/queue.h> -#include <sys/vimage.h> #include <net/bpf.h> #include <net/ethernet.h> ==== //depot/projects/vimage/src/sys/net/if_var.h#19 (text+ko) ==== @@ -664,8 +664,8 @@ extern int ifqmaxlen; #ifndef VIMAGE extern struct ifnethead ifnet; +extern struct ifnet *loif; /* first loopback interface */ extern int if_index; -extern struct ifnet *loif; /* first loopback interface */ #endif /* !VIMAGE */ int if_addgroup(struct ifnet *, const char *); ==== //depot/projects/vimage/src/sys/net/netisr.c#12 (text+ko) ==== @@ -43,13 +43,13 @@ #include <sys/resourcevar.h> #include <sys/sysctl.h> #include <sys/unistd.h> +#include <sys/vimage.h> #include <machine/atomic.h> #include <machine/cpu.h> #include <machine/stdarg.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/if_types.h> ==== //depot/projects/vimage/src/sys/net/route.c#30 (text+ko) ==== @@ -117,7 +117,7 @@ */ #define RNTORT(p) ((struct rtentry *)(p)) -static uma_zone_t rtzone; /* Routing table UMA zone. */ +static uma_zone_t rtzone; /* Routing table UMA zone. */ #if 0 /* default fib for tunnels to use */ ==== //depot/projects/vimage/src/sys/net/rtsock.c#19 (text+ko) ==== @@ -415,8 +415,7 @@ case RTM_GET: case RTM_CHANGE: case RTM_LOCK: - rnh = - V_rt_tables[so->so_fibnum][info.rti_info[RTAX_DST]->sa_family]; + rnh = V_rt_tables[so->so_fibnum][info.rti_info[RTAX_DST]->sa_family]; if (rnh == NULL) senderr(EAFNOSUPPORT); RADIX_NODE_HEAD_LOCK(rnh); ==== //depot/projects/vimage/src/sys/net/vnet.h#15 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/net/vnet.h,v 1.1 2008/10/02 15:37:58 zec Exp $ */ #ifndef _NET_VNET_H_ ==== //depot/projects/vimage/src/sys/net80211/ieee80211.c#22 (text+ko) ==== @@ -42,9 +42,7 @@ #include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> -#include <net/if_var.h> #include <net/ethernet.h> -#include <net/vnet.h> #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_regdomain.h> ==== //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#13 (text+ko) ==== @@ -43,7 +43,6 @@ #include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> -#include <net/vnet.h> #include <net/ethernet.h> #include <net80211/ieee80211_var.h> ==== //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#15 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netgraph/atm/ng_atm.c#9 (text+ko) ==== @@ -54,7 +54,6 @@ #include <net/if_var.h> #include <net/if_media.h> #include <net/if_atm.h> -#include <net/vnet.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> @@ -1403,11 +1402,11 @@ ng_atm_input_orphan_p = ng_atm_input_orphans; ng_atm_event_p = ng_atm_event; + /* Create nodes for existing ATM interfaces */ VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET_QUIET(vnet_iter); - INIT_VNET_NET(vnet_iter); - /* Create nodes for existing ATM interfaces */ + INIT_VNET_NET(vnet_iter); TAILQ_FOREACH(ifp, &V_ifnet, if_link) { if (ifp->if_type == IFT_ATM) ng_atm_attach(ifp); @@ -1431,7 +1430,7 @@ VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET_QUIET(vnet_iter); - INIT_VNET_NET(vnet_iter); + INIT_VNET_NET(vnet_iter); TAILQ_FOREACH(ifp, &V_ifnet, if_link) { if (ifp->if_type == IFT_ATM) ng_atm_detach(ifp); ==== //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#17 (text+ko) ==== @@ -43,7 +43,6 @@ #include <net/if.h> #include <net/if_types.h> #include <net/netisr.h> -#include <net/route.h> #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> ==== //depot/projects/vimage/src/sys/netgraph/ng_ether.c#15 (text+ko) ==== @@ -56,7 +56,6 @@ #include <sys/socket.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> ==== //depot/projects/vimage/src/sys/netgraph/ng_gif.c#10 (text+ko) ==== @@ -79,7 +79,6 @@ #include <sys/socket.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/route.h> #include <net/if_types.h> ==== //depot/projects/vimage/src/sys/netgraph/ng_pipe.c#9 (text+ko) ==== @@ -26,6 +26,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/netgraph/ng_pipe.c,v 1.1 2008/09/03 18:17:45 julian Exp $ */ /* ==== //depot/projects/vimage/src/sys/netgraph/ng_pipe.h#4 (text+ko) ==== @@ -26,6 +26,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/netgraph/ng_pipe.h,v 1.1 2008/09/03 18:17:45 julian Exp $ */ #ifndef _NETGRAPH_PIPE_H_ ==== //depot/projects/vimage/src/sys/netinet/accf_http.c#4 (text+ko) ==== @@ -74,7 +74,6 @@ static int parse_http_version; #endif -/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ struct vnet_accf_http { int _parse_http_version; }; @@ -93,8 +92,6 @@ VNET_MOD_DECLARE(ACCF_HTTP, accf_http, vnet_accf_http_iattach, NULL, INET, NULL) -/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ - SYSCTL_NODE(_net_inet_accf, OID_AUTO, http, CTLFLAG_RW, 0, "HTTP accept filter"); SYSCTL_V_INT(V_NET, vnet_accf_http, _net_inet_accf_http, OID_AUTO, ==== //depot/projects/vimage/src/sys/netinet/in_gif.c#14 (text+ko) ==== @@ -51,7 +51,6 @@ #include <net/if.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> ==== //depot/projects/vimage/src/sys/netinet/in_pcb.c#36 (text+ko) ==== @@ -76,6 +76,7 @@ #include <netinet6/ip6_var.h> #endif /* INET6 */ + #ifdef IPSEC #include <netipsec/ipsec.h> #include <netipsec/key.h> ==== //depot/projects/vimage/src/sys/netinet/ip_carp.c#14 (text+ko) ==== @@ -68,7 +68,6 @@ #include <net/route.h> #ifdef INET -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/in_systm.h> @@ -79,7 +78,6 @@ #endif #ifdef INET6 -#include <netinet6/vinet6.h> #include <netinet/icmp6.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#51 (text+ko) ==== @@ -65,7 +65,6 @@ #include <sys/syslog.h> #include <sys/ucred.h> #include <sys/vimage.h> - #include <net/if.h> #include <net/radix.h> #include <net/route.h> ==== //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#12 (text+ko) ==== @@ -46,7 +46,6 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/sysctl.h> -#include <sys/proc.h> #include <sys/ucred.h> #include <sys/vimage.h> ==== //depot/projects/vimage/src/sys/netinet/ip_id.c#7 (text+ko) ==== @@ -85,11 +85,9 @@ #include <sys/random.h> #include <sys/systm.h> #include <sys/sysctl.h> -#include <sys/bitstring.h> - #include <netinet/in.h> -#include <netinet/in_var.h> #include <netinet/ip_var.h> +#include <sys/bitstring.h> static MALLOC_DEFINE(M_IPID, "ipid", "randomized ip id state"); ==== //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#15 (text+ko) ==== @@ -47,7 +47,6 @@ #include <net/if.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/in_var.h> @@ -63,7 +62,6 @@ #include <netipsec/ipsec.h> #include <netipsec/xform.h> #include <netipsec/key.h> -#include <netipsec/vipsec.h> #endif /*IPSEC*/ extern struct protosw inetsw[]; ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#15 (text+ko) ==== @@ -84,7 +84,6 @@ #include <net/if.h> #include <net/netisr.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/igmp.h> #include <netinet/in_systm.h> ==== //depot/projects/vimage/src/sys/netinet/sctp_output.c#32 (text+ko) ==== @@ -33,11 +33,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/netinet/sctp_output.c,v 1.76 2008/08/28 09:44:07 rrs Exp $"); - #include <netinet/sctp_os.h> #include <sys/proc.h> -#include <sys/vimage.h> -#include <netinet/vinet.h> #include <netinet/sctp_var.h> #include <netinet/sctp_sysctl.h> #include <netinet/sctp_header.h> ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#28 (text+ko) ==== @@ -57,6 +57,11 @@ * of bucket limit memory constrains. */ +/* + * Many thanks to jlemon for basic structure of tcp_syncache which is being + * followed here. + */ + #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.23 2008/10/02 15:37:58 zec Exp $"); @@ -90,7 +95,6 @@ #ifdef INET6 #include <netinet6/tcp6_var.h> #endif -#include <netinet/tcp_hostcache.h> #include <vm/uma.h> ==== //depot/projects/vimage/src/sys/netinet/tcp_offload.c#10 (text+ko) ==== @@ -43,7 +43,6 @@ #include <net/if_types.h> #include <net/if_var.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/in_pcb.h> ==== //depot/projects/vimage/src/sys/netinet/tcp_reass.c#9 (text+ko) ==== @@ -52,7 +52,6 @@ #include <net/if.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_pcb.h> #include <netinet/in_systm.h> ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#17 (text+ko) ==== @@ -1,12 +1,6 @@ /*- - * Copyright (c) 2001 McAfee, Inc. - * Copyright (c) 2006 Andre Oppermann, Internet Business Solutions AG - * All rights reserved. - * - * This software was developed for the FreeBSD Project by Jonathan Lemon - * and McAfee Research, the Security Research Division of McAfee, Inc. under - * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Copyright (c) 1982, 1986, 1993, 1994, 1995 + * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -16,11 +10,14 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810081750.m98HoEfQ074216>