From owner-p4-projects@FreeBSD.ORG Fri Jul 25 08:48:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D203C106567A; Fri, 25 Jul 2008 08:48:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9628E1065677 for ; Fri, 25 Jul 2008 08:48:07 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 76A9D8FC18 for ; Fri, 25 Jul 2008 08:48:07 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m6P8m7sc030315 for ; Fri, 25 Jul 2008 08:48:07 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6P8m7E1030313 for perforce@freebsd.org; Fri, 25 Jul 2008 08:48:07 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 25 Jul 2008 08:48:07 GMT Message-Id: <200807250848.m6P8m7E1030313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 145871 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jul 2008 08:48:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=145871 Change 145871 by zec@zec_tinderbox on 2008/07/25 08:47:42 Merge vimage -> vimage-devel using p4 integrate, as suggested by julian. Affected files ... .. //depot/projects/vimage-devel/src/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/vimage-devel/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_stat.c#4 integrate .. //depot/projects/vimage-devel/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/vimage-devel/src/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/syscons/daemon/daemon_saver.c#4 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/NOTES#6 integrate .. //depot/projects/vimage-devel/src/sys/i386/ibcs2/ibcs2_socksys.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_jail.c#5 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_mib.c#5 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#8 integrate .. //depot/projects/vimage-devel/src/sys/net/netisr.c#5 integrate .. //depot/projects/vimage-devel/src/sys/net/raw_cb.c#4 integrate .. //depot/projects/vimage-devel/src/sys/net/raw_usrreq.c#4 integrate .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_bridge.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_fw_pfil.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_offload.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/keysock.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/vipsec.h#4 integrate .. //depot/projects/vimage-devel/src/sys/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/vimage-devel/src/sys/nlm/nlm_advlock.c#4 integrate .. //depot/projects/vimage-devel/src/sys/sys/sysctl.h#7 integrate .. //depot/projects/vimage-devel/src/usr.sbin/vimage/Makefile#3 integrate .. //depot/projects/vimage-devel/src/usr.sbin/vimage/vimage.c#3 integrate Differences ... ==== //depot/projects/vimage-devel/src/sys/compat/linux/linux_misc.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/compat/linux/linux_socket.c#3 (text+ko) ==== @@ -58,10 +58,10 @@ #include #include #include +#include #ifdef INET6 #include #include -#include #endif #ifdef COMPAT_LINUX32 @@ -550,10 +550,9 @@ static int linux_socket(struct thread *td, struct linux_socket_args *args) { -#ifndef KLD_MODULE +#ifdef INET6 INIT_VNET_INET6(curvnet); #endif - struct linux_socket_args linux_args; struct socket_args /* { int domain; @@ -592,13 +591,7 @@ * 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-devel/src/sys/compat/svr4/svr4_stat.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/dev/lmc/if_lmc.c#3 (text+ko) ==== @@ -80,6 +80,9 @@ # ifdef HAVE_KERNEL_OPTION_HEADERS # include "opt_device_polling.h" /* DEVICE_POLLING */ # endif +# ifndef INET6 +# define INET6 0 +# endif # ifndef NETGRAPH # define NETGRAPH 0 # endif ==== //depot/projects/vimage-devel/src/sys/dev/syscons/daemon/daemon_saver.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/i386/conf/NOTES#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/i386/ibcs2/ibcs2_socksys.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/kern_jail.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/kern_mib.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/kern_sysctl.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#8 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/netisr.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/raw_cb.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/raw_usrreq.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211_freebsd.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#7 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_bridge.c#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#9 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/ip_fw2.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/ip_fw_pfil.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/raw_ip.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_offload.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/udp_usrreq.c#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet6/icmp6.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet6/in6.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet6/in6_ifattach.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet6/in6_proto.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet6/raw_ip6.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet6/sctp6_usrreq.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet6/udp6_usrreq.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netipsec/ipsec.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netipsec/keysock.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netipsec/vipsec.h#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/nfsclient/bootp_subr.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/nfsclient/nfs_vfsops.c#6 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/nlm/nlm_advlock.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/sys/sysctl.h#7 (text+ko) ==== ==== //depot/projects/vimage-devel/src/usr.sbin/vimage/Makefile#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/usr.sbin/vimage/vimage.c#3 (text+ko) ====