From owner-p4-projects@FreeBSD.ORG Fri Jul 6 11:08:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 642E816A421; Fri, 6 Jul 2007 11:08:29 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3B72B16A400 for ; Fri, 6 Jul 2007 11:08:29 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 29DF113C455 for ; Fri, 6 Jul 2007 11:08:29 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l66B8Tlp081288 for ; Fri, 6 Jul 2007 11:08:29 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l66B8Qfu081285 for perforce@freebsd.org; Fri, 6 Jul 2007 11:08:26 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 6 Jul 2007 11:08:26 GMT Message-Id: <200707061108.l66B8Qfu081285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 123008 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, 06 Jul 2007 11:08:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=123008 Change 123008 by rdivacky@rdivacky_witten on 2007/07/06 11:07:26 IFC Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/NOTES#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/re/if_re.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/snp/snp.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/es137x.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/udbp.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/i4b_cause.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/i4b_debug.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/i4b_ioctl.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/i4b_trace.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/capi/capi_l4if.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/capi/capi_llif.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/capi/capi_msgs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/capi/iavc/iavc_card.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/capi/iavc/iavc_isa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/capi/iavc/iavc_lli.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/capi/iavc/iavc_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_ctl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_ing.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_ipr.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_isppp.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_rbch.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_tel.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_trace.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/include/i4b_cause.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/include/i4b_debug.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/include/i4b_ioctl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/include/i4b_l1l2.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/include/i4b_rbch_ioctl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/include/i4b_tel_ioctl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/include/i4b_trace.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/i4b_l1dmux.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/i4b_l1lib.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_bchan.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_ctx_s0P.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_diva.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_drn_ngo.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_dynalink.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_hscx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_isac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_isic_pnp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_l1.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_l1fsm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_siemens_isurf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_sws.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/isic/i4b_usr_sti.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer2/i4b_iframe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer2/i4b_l2.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer2/i4b_l2fsm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer2/i4b_l2timer.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer2/i4b_lme.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer2/i4b_sframe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer2/i4b_tei.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer2/i4b_uframe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer2/i4b_util.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer3/i4b_l2if.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer3/i4b_l3fsm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer3/i4b_l3timer.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer3/i4b_l4if.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer3/i4b_q931.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer3/i4b_q932fac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer4/i4b_i4bdrv.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer4/i4b_l4.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer4/i4b_l4timer.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_conf.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/dest6.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/frag6.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_id.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/mld6.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/nd6.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/raw_ip6.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/route6.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/scope6.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/sctp6_usrreq.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/sctp6_var.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/udp6_output.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/include/i4b_cause.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/include/i4b_debug.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/include/i4b_ioctl.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/include/i4b_trace.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/param.h#5 integrate Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/conf/NOTES#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1440 2007/07/03 12:13:42 gnn Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1441 2007/07/05 15:33:13 gnn Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -490,12 +490,14 @@ # NETWORKING OPTIONS # -# Protocol families: -# Only the INET (Internet) family is officially supported in FreeBSD. +# Protocol families # options INET #Internet communications protocols options INET6 #IPv6 communications protocols -options IPSEC #IP security + +# In order to enable IPSEC you MUST also add device crypto to +# your kernel configuration +options IPSEC #IP security (requires device crypto) #options IPSEC_DEBUG #debug for IP security # # Set IPSEC_FILTERGIF to force packets coming through a gif tunnel ==== //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1233 2007/07/05 07:04:17 peter Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1234 2007/07/05 15:28:59 mlaier Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -336,7 +336,7 @@ contrib/pf/net/pf_ruleset.c optional pf \ compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/pf/net/pf_subr.c optional pf \ - compile-with "${NORMAL_C_NOWERROR} -I$S/contrib/pf" + compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/pf/net/pf_table.c optional pf \ compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/pf/netinet/in4_cksum.c optional pf inet ==== //depot/projects/soc2007/rdivacky/linux_at/sys/conf/kern.pre.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.86 2007/07/05 09:30:34 peter Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.88 2007/07/06 01:50:58 peter Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -90,7 +90,8 @@ CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 CFLAGS+= --param large-function-growth=1000 -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || \ + ${MACHINE_ARCH} == "sparc64" WERROR?= -Werror .endif .endif ==== //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/pf_subr.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.3 2007/07/03 12:16:07 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.4 2007/07/05 15:28:59 mlaier Exp $"); #include #include @@ -116,7 +116,7 @@ static u_char isn_secret[32]; static int isn_last_reseed; -static u_int32_t isn_offset, isn_offset_old; +static u_int32_t isn_offset; static MD5_CTX isn_ctx; u_int32_t ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ipw/if_ipw.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.28 2007/06/29 02:43:13 kevlo Exp $ */ +/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.29 2007/07/05 15:06:49 avatar Exp $ */ /*- * Copyright (c) 2004-2006 @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.28 2007/06/29 02:43:13 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.29 2007/07/05 15:06:49 avatar Exp $"); /*- * Intel(R) PRO/Wireless 2100 MiniPCI driver @@ -1847,7 +1847,8 @@ #ifdef IPW_DEBUG if (ipw_debug > 0) { printf("Setting ESSID to "); - ieee80211_print_essid(ic->ic_des_essid, ic->ic_des_esslen); + ieee80211_print_essid(ic->ic_des_ssid[0].ssid, + ic->ic_des_ssid[0].len); printf("\n"); } #endif ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nxge/if_nxge.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nxge/if_nxge.c,v 1.1 2007/06/29 22:47:16 sam Exp $ + * $FreeBSD: src/sys/dev/nxge/if_nxge.c,v 1.2 2007/07/06 00:47:43 peter Exp $ */ /* @@ -252,8 +252,8 @@ if(dconfig->fifo.max_frags > (PAGE_SIZE/32)) { xge_os_printf("fifo_max_frags = %d", dconfig->fifo.max_frags); xge_os_printf("fifo_max_frags should be <= (PAGE_SIZE / 32) = %d", - (PAGE_SIZE / 32)); - xge_os_printf("Using fifo_max_frags = %d", (PAGE_SIZE / 32)); + (int)(PAGE_SIZE / 32)); + xge_os_printf("Using fifo_max_frags = %d", (int)(PAGE_SIZE / 32)); dconfig->fifo.max_frags = (PAGE_SIZE / 32); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ofw/openfirm.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirm.c,v 1.20 2007/06/16 22:34:16 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirm.c,v 1.21 2007/07/06 00:47:44 peter Exp $"); #include #include @@ -139,9 +139,9 @@ cell_t status; int i = 0; + va_start(ap, nreturns); args.nreturns = ++nreturns; args.slot[i++] = (cell_t)cmd; - va_start(ap, nreturns); while (i < 1) args.slot[i++] = va_arg(ap, cell_t); if (openfirmware(&args) == -1) { ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/re/if_re.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.90 2007/06/16 02:54:19 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.91 2007/07/06 00:05:11 yongari Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -1211,10 +1211,10 @@ hw_rev++; } - sc->rl_eewidth = 6; + sc->rl_eewidth = RL_9356_ADDR_LEN; re_read_eeprom(sc, (caddr_t)&re_did, 0, 1); if (re_did != 0x8129) - sc->rl_eewidth = 8; + sc->rl_eewidth = RL_9346_ADDR_LEN; /* * Get station address from the EEPROM. ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/snp/snp.c#3 (text+ko) ==== @@ -15,7 +15,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.104 2007/07/03 17:43:56 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.105 2007/07/05 13:07:12 kib Exp $"); #include #include @@ -118,7 +118,7 @@ static struct tty *snpdevtotty(struct cdev *dev); static void snp_clone(void *arg, struct ucred *cred, char *name, int namelen, struct cdev **dev); -static int snp_detach(struct snoop *snp); +static void snp_detach(void *arg); static int snp_down(struct snoop *snp); static int snp_in(struct snoop *snp, char *buf, int n); static int snp_modevent(module_t mod, int what, void *arg); @@ -422,11 +422,13 @@ } -static int -snp_detach(struct snoop *snp) +static void +snp_detach(void *arg) { + struct snoop *snp; struct tty *tp; + snp = (struct snoop *)arg; snp->snp_base = 0; snp->snp_len = 0; @@ -451,8 +453,6 @@ selwakeuppri(&snp->snp_sel, PZERO + 1); if ((snp->snp_flags & SNOOP_OPEN) == 0) free(snp, M_SNP); - - return (0); } static int @@ -466,9 +466,9 @@ free(snp->snp_buf, M_SNP); snp->snp_flags &= ~SNOOP_OPEN; dev->si_drv1 = NULL; - destroy_dev(dev); + destroy_dev_sched_cb(dev, snp_detach, snp); - return (snp_detach(snp)); + return (0); } static int @@ -481,8 +481,9 @@ snp->snp_blen = SNOOP_MINLEN; } snp->snp_flags |= SNOOP_DOWN; + snp_detach(snp); - return (snp_detach(snp)); + return (0); } static int ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/es137x.c#5 (text+ko) ==== @@ -59,7 +59,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.70 2007/06/17 06:10:42 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.71 2007/07/05 10:22:37 ariff Exp $"); #define MEM_MAP_REG 0x14 @@ -543,8 +543,10 @@ ES_LOCK(es); /* Fixed rate , do nothing. */ - if (ch->caps.minspeed == ch->caps.maxspeed) + if (ch->caps.minspeed == ch->caps.maxspeed) { + ES_UNLOCK(es); return (ch->caps.maxspeed); + } if (speed < ch->caps.minspeed) speed = ch->caps.minspeed; if (speed > ch->caps.maxspeed) ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/udbp.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/udbp.c,v 1.40 2007/06/22 05:14:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/udbp.c,v 1.41 2007/07/05 15:25:32 imp Exp $"); /* Driver for arbitrary double bulk pipe devices. * The driver assumes that there will be the same driver on the other side. @@ -294,8 +294,7 @@ for (i = 0 ; i < id->bNumEndpoints; i++) { ed = usbd_interface2endpoint_descriptor(iface, i); if (!ed) { - printf("%s: could not read endpoint descriptor\n", - device_get_nameunit(sc->sc_dev)); + device_printf(self, "could not read endpoint descriptor\n"); return ENXIO; } @@ -313,19 +312,18 @@ /* Verify that we goething sensible */ if (ed_bulkin == NULL || ed_bulkout == NULL) { - printf("%s: bulk-in and/or bulk-out endpoint not found\n", - device_get_nameunit(sc->sc_dev)); + device_printf(self, "bulk-in and/or bulk-out endpoint not found\n"); return ENXIO; } if (ed_bulkin->wMaxPacketSize[0] != ed_bulkout->wMaxPacketSize[0] || ed_bulkin->wMaxPacketSize[1] != ed_bulkout->wMaxPacketSize[1]) { - printf("%s: bulk-in and bulk-out have different packet sizes %d %d %d %d\n", - device_get_nameunit(sc->sc_dev), - ed_bulkin->wMaxPacketSize[0], - ed_bulkout->wMaxPacketSize[0], - ed_bulkin->wMaxPacketSize[1], - ed_bulkout->wMaxPacketSize[1]); + device_printf(self, + "bulk-in and bulk-out have different packet sizes %d %d %d %d\n", + ed_bulkin->wMaxPacketSize[0], + ed_bulkout->wMaxPacketSize[0], + ed_bulkin->wMaxPacketSize[1], + ed_bulkout->wMaxPacketSize[1]); return ENXIO; } @@ -360,15 +358,15 @@ err = usbd_open_pipe(iface, sc->sc_bulkin, USBD_EXCLUSIVE_USE, &sc->sc_bulkin_pipe); if (err) { - printf("%s: cannot open bulk-in pipe (addr %d)\n", - device_get_nameunit(sc->sc_dev), sc->sc_bulkin); + device_printf(self, "cannot open bulk-in pipe (addr %d)\n", + sc->sc_bulkin); goto bad; } err = usbd_open_pipe(iface, sc->sc_bulkout, USBD_EXCLUSIVE_USE, &sc->sc_bulkout_pipe); if (err) { - printf("%s: cannot open bulk-out pipe (addr %d)\n", - device_get_nameunit(sc->sc_dev), sc->sc_bulkout); + device_printf(self, "cannot open bulk-out pipe (addr %d)\n", + sc->sc_bulkout); goto bad; } @@ -572,9 +570,8 @@ pktlen = m->m_pkthdr.len; if (pktlen > sc->sc_bulkout_bufferlen) { - printf("%s: Packet too large, %d > %d\n", - device_get_nameunit(sc->sc_dev), pktlen, - sc->sc_bulkout_bufferlen); + device_printf(sc->sc_dev, "Packet too large, %d > %d\n", + pktlen, sc->sc_bulkout_bufferlen); return (USBD_IOERROR); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/capi/capi_l4if.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_l4if.c,v 1.7 2005/01/06 22:18:18 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_l4if.c,v 1.8 2007/07/06 07:17:17 bz Exp $"); #include #include @@ -36,9 +36,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/capi/capi_llif.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_llif.c,v 1.4 2005/01/06 22:18:18 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_llif.c,v 1.5 2007/07/06 07:17:17 bz Exp $"); #include #include @@ -36,9 +36,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/capi/capi_msgs.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_msgs.c,v 1.5 2005/01/06 22:18:18 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_msgs.c,v 1.6 2007/07/06 07:17:17 bz Exp $"); #include #include @@ -36,9 +36,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/capi/iavc/iavc_card.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_card.c,v 1.6 2006/05/16 14:37:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_card.c,v 1.7 2007/07/06 07:17:17 bz Exp $"); #include #include @@ -43,9 +43,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/capi/iavc/iavc_isa.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_isa.c,v 1.11 2007/02/23 20:11:26 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_isa.c,v 1.12 2007/07/06 07:17:17 bz Exp $"); #include #include @@ -42,9 +42,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/capi/iavc/iavc_lli.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_lli.c,v 1.9 2006/05/16 14:37:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_lli.c,v 1.10 2007/07/06 07:17:17 bz Exp $"); #include #include @@ -45,9 +45,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/capi/iavc/iavc_pci.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_pci.c,v 1.12 2007/02/23 20:11:26 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_pci.c,v 1.13 2007/07/06 07:17:17 bz Exp $"); #include #include @@ -48,9 +48,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_ctl.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ctl.c,v 1.26 2005/01/06 22:18:18 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ctl.c,v 1.27 2007/07/06 07:17:18 bz Exp $"); #include #include @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_ing.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ing.c,v 1.25 2007/07/04 00:18:39 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ing.c,v 1.26 2007/07/06 07:17:18 bz Exp $"); #include "opt_i4b.h" @@ -50,8 +50,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_ipr.c#3 (text+ko) ==== @@ -55,7 +55,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ipr.c,v 1.39 2007/07/04 00:18:39 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ipr.c,v 1.40 2007/07/06 07:17:18 bz Exp $"); #include "opt_i4b.h" @@ -98,8 +98,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_isppp.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_isppp.c,v 1.32 2007/07/04 00:18:39 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_isppp.c,v 1.33 2007/07/06 07:17:18 bz Exp $"); #include "opt_i4b.h" @@ -60,8 +60,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_rbch.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_rbch.c,v 1.35 2005/01/06 22:18:18 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_rbch.c,v 1.36 2007/07/06 07:17:18 bz Exp $"); #include "opt_i4b.h" @@ -48,9 +48,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_tel.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_tel.c,v 1.36 2005/01/06 22:18:18 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_tel.c,v 1.37 2007/07/06 07:17:18 bz Exp $"); #include "opt_i4b.h" @@ -50,9 +50,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/driver/i4b_trace.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_trace.c,v 1.32 2005/01/06 22:18:18 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_trace.c,v 1.33 2007/07/06 07:17:18 bz Exp $"); #include "opt_i4b.h" @@ -49,8 +49,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/include/i4b_l1l2.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * i4b_l1l2.h - i4b layer 1 / layer 2 interactions * --------------------------------------------------- * - * $FreeBSD: src/sys/i4b/include/i4b_l1l2.h,v 1.9 2005/01/06 22:18:18 imp Exp $ + * $FreeBSD: src/sys/i4b/include/i4b_l1l2.h,v 1.10 2007/07/06 07:17:18 bz Exp $ * * last edit-date: [Sat Mar 9 15:54:49 2002] * @@ -37,7 +37,7 @@ #ifndef _I4B_L1L2_H_ #define _I4B_L1L2_H_ -#include +#include extern struct i4b_l1l2_func i4b_l1l2_func; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/i4b_l1dmux.c#2 (text+ko) ==== @@ -32,14 +32,14 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/layer1/i4b_l1dmux.c,v 1.8 2005/01/06 22:18:19 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/layer1/i4b_l1dmux.c,v 1.9 2007/07/06 07:17:18 bz Exp $"); #include #include -#include -#include -#include +#include +#include +#include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/i4b_l1lib.c#2 (text+ko) ==== @@ -33,13 +33,13 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/layer1/i4b_l1lib.c,v 1.5 2005/01/06 22:18:19 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/layer1/i4b_l1lib.c,v 1.6 2007/07/06 07:17:18 bz Exp $"); #include #include -#include -#include +#include +#include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.8 2005/01/06 22:18:19 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.9 2007/07/06 07:17:19 bz Exp $"); #include "opt_i4b.h" @@ -44,9 +44,9 @@ #include -#include -#include -#include +#include +#include +#include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c,v 1.8 2005/01/06 22:18:19 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c,v 1.9 2007/07/06 07:17:19 bz Exp $"); #include #include @@ -42,9 +42,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c,v 1.8 2005/01/06 22:18:19 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c,v 1.9 2007/07/06 07:17:19 bz Exp $"); #include #include @@ -42,9 +42,9 @@ #include -#include -#include -#include +#include +#include +#include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ *---------------------------------------------------------------------------*/ >>> TRUNCATED FOR MAIL (1000 lines) <<<