Date: Wed, 7 Apr 2004 19:40:10 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 50640 for review Message-ID: <200404080240.i382eABD011400@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=50640 Change 50640 by rwatson@rwatson_paprika on 2004/04/07 19:39:15 Integrate netperf_socket: - More removal of third clause. - More NDIS evil. - bs driver removed. - ACPI PCI bar support of some sort. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/timerreg.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/arc/lib/elf_freebsd.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/common/newvers.sh#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#11 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#7 integrate .. //depot/projects/netperf_socket/sys/conf/newvers.sh#2 integrate .. //depot/projects/netperf_socket/sys/conf/systags.sh#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_ps.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/fb/gallant12x22.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ic/i8251.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ic/nec765.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openfirmio.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openfirmio.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sioreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sio/siovar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/zs/z8530reg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/fifofs/fifo.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_hash.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_mem.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_note.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_status.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_type.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/specfs/spec_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/umapfs/umap.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/umapfs/umap_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/umapfs/umap_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/umapfs/umap_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_alloc.c#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_balloc.c#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_extern.h#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_ihash.c#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_lookup.c#4 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_mount.h#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_readwrite.c#3 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/fs.h#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/inode.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/apic_vector.s#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/autoconf.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/exception.s#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/in_cksum.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/locore.s#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mem.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/support.s#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/uio_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/_limits.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/asm.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/cpu.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/cpufunc.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/endian.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/exec.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/float.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/frame.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/in_cksum.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/limits.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/npx.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/param.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/pcb.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/pmap.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/proc.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/profile.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/psl.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/ptrace.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/reg.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/reloc.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/segments.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/signal.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/sysarch.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/trap.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/tss.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/varargs.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/atpic_vector.s#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/bs/bs.c#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/bs/bsfunc.c#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/bs/bsfunc.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/bs/bshw.c#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/bs/bshw.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/bs/bshw.lst#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/bs/bshw_dma.c#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/bs/bshw_pdma.c#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/bs/bsif.c#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/bs/bsif.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/bs/bsvar.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/clock.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/icu.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/isa.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/isa_dma.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/isa_dma.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/nmi.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/npx.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/timerreg.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/genassym.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/mem.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/uio_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/_limits.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/cpu.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/endian.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/float.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/ieee.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/in_cksum.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/limits.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/param.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/pmap.h#4 integrate .. //depot/projects/netperf_socket/sys/ia64/include/ptrace.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/vmparam.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/isa/isa_dma.c#2 integrate .. //depot/projects/netperf_socket/sys/isa/fd.c#5 integrate .. //depot/projects/netperf_socket/sys/isa/fdreg.h#2 integrate .. //depot/projects/netperf_socket/sys/isa/isareg.h#2 integrate .. //depot/projects/netperf_socket/sys/isa/rtc.h#2 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_bmap.c#2 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_mount.h#2 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_rrip.h#2 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_util.c#2 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/iso.h#2 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/iso_rrip.h#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_event.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#3 integrate .. //depot/projects/netperf_socket/sys/libkern/ashldi3.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/ashrdi3.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/bcmp.c#3 integrate .. //depot/projects/netperf_socket/sys/libkern/bsearch.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/divdi3.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/ffs.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/ffsl.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/fls.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/flsl.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/fnmatch.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/index.c#3 integrate .. //depot/projects/netperf_socket/sys/libkern/lshrdi3.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/mcount.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/moddi3.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/qdivrem.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/qsort.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/quad.h#3 integrate .. //depot/projects/netperf_socket/sys/libkern/random.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/rindex.c#3 integrate .. //depot/projects/netperf_socket/sys/libkern/scanc.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/skpc.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/strcat.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/strcmp.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/strcpy.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/strlen.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/strncmp.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/strncpy.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/strsep.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/strtol.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/strtoq.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/strtoul.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/strtouq.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/ucmpdi2.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/udivdi3.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/umoddi3.c#2 integrate .. //depot/projects/netperf_socket/sys/net/bpf.c#5 integrate .. //depot/projects/netperf_socket/sys/net/bpf.h#4 integrate .. //depot/projects/netperf_socket/sys/net/bpf_compat.h#2 integrate .. //depot/projects/netperf_socket/sys/net/bpf_filter.c#2 integrate .. //depot/projects/netperf_socket/sys/net/bpfdesc.h#4 integrate .. //depot/projects/netperf_socket/sys/net/bsd_comp.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if.c#4 integrate .. //depot/projects/netperf_socket/sys/net/if.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_arc.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_arp.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_disc.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_dl.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#10 integrate .. //depot/projects/netperf_socket/sys/net/if_faith.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_llc.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_loop.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_sl.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_slvar.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_types.h#3 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#5 integrate .. //depot/projects/netperf_socket/sys/net/netisr.h#2 integrate .. //depot/projects/netperf_socket/sys/net/radix.c#2 integrate .. //depot/projects/netperf_socket/sys/net/radix.h#2 integrate .. //depot/projects/netperf_socket/sys/net/raw_cb.c#3 integrate .. //depot/projects/netperf_socket/sys/net/raw_cb.h#2 integrate .. //depot/projects/netperf_socket/sys/net/raw_usrreq.c#4 integrate .. //depot/projects/netperf_socket/sys/net/route.c#4 integrate .. //depot/projects/netperf_socket/sys/net/route.h#5 integrate .. //depot/projects/netperf_socket/sys/net/rtsock.c#2 integrate .. //depot/projects/netperf_socket/sys/net/slcompress.c#2 integrate .. //depot/projects/netperf_socket/sys/net/slcompress.h#2 integrate .. //depot/projects/netperf_socket/sys/net/slip.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/icmp6.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/icmp_var.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/if_ether.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/if_ether.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/igmp.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/igmp.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/igmp_var.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/in.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/in.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/in_cksum.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/in_proto.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/in_systm.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/in_var.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip6.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_divert.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_icmp.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#9 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_output.c#7 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_var.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ipprotosw.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_debug.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_debug.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_fsm.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_seq.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/tcpip.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/udp.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/udp_var.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_pcb.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_prefix.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/mld6.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet6/tcp6_var.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/udp6_output.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet6/udp6_var.h#2 integrate .. //depot/projects/netperf_socket/sys/nfs/nfs_common.c#2 integrate .. //depot/projects/netperf_socket/sys/nfs/nfs_common.h#2 integrate .. //depot/projects/netperf_socket/sys/nfs/nfsproto.h#2 integrate .. //depot/projects/netperf_socket/sys/nfs/rpcv2.h#2 integrate .. //depot/projects/netperf_socket/sys/nfs/xdr_subs.h#2 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_socket.c#3 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs.h#5 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfsargs.h#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfsstats.h#2 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs.h#5 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvcache.c#4 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsock.c#5 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfsm_subs.h#2 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfsrvcache.h#2 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfsrvstats.h#2 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC.hints#4 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/clock.c#4 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fdreg.h#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/isa_dma.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/nmi.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/pc98.h#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#4 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/wd.c#3 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/wdreg.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/_limits.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/endian.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/float.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/ieee.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/in_cksum.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/limits.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/ptrace.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/bcopy.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/uio_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/rpc/rpcclnt.h#3 integrate .. //depot/projects/netperf_socket/sys/rpc/rpcm_subs.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/_types.h#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/asm.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/bus_common.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/eeprom.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/endian.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/float.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/ieee.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/in_cksum.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/iommureg.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/pmap.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/proc.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/ptrace.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/reg.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/signal.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/sysarch.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sbus/sbusvar.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/bus_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_ebus.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_fhc.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_sbus.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/in_cksum.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/iommu.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/mem.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/uio_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/sys/_iovec.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/_sigset.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/_timespec.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/acct.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/bio.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/bitstring.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/buf.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/callout.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/cdefs.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/clist.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/conf.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/cons.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/ctype.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/dir.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/dirent.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/disklabel.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/diskmbr.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/diskpc98.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/dkstat.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/domain.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/errno.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/exec.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/fbio.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/fcntl.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/file.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/filedesc.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/filio.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/gmon.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/imgact.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/imgact_aout.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/ioccom.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/ioctl.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/ipc.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/ktrace.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/libkern.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/limits.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/lockf.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/lockmgr.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/malloc.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/mdioctl.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/mman.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/mount.h#6 integrate .. //depot/projects/netperf_socket/sys/sys/msgbuf.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/mtio.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/namei.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/nlist_aout.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#6 integrate .. //depot/projects/netperf_socket/sys/sys/protosw.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/ptrace.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/queue.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/reboot.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/resource.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/resourcevar.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/select.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/selinfo.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/sigio.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/signal.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/signalvar.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/socket.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/sockio.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/stat.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/sun_disklabel.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/sysctl.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/sysent.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/syslimits.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/syslog.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/systm.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/termios.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/time.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/timeb.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/times.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/timespec.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/tty.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/ttychars.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/ttycom.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/ttydefaults.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/ttydev.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/types.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/ucred.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/uio.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/un.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/unistd.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/unpcb.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/user.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/utsname.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/vmmeter.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/vnode.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/wait.h#3 integrate .. //depot/projects/netperf_socket/sys/tools/makeobjops.awk#2 integrate .. //depot/projects/netperf_socket/sys/tools/vnode_if.awk#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#4 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/timerreg.h#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 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. @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp - * $FreeBSD: src/sys/alpha/alpha/timerreg.h,v 1.2 1999/08/28 00:38:32 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/timerreg.h,v 1.3 2004/04/07 20:45:55 imp Exp $ */ /* ==== //depot/projects/netperf_socket/sys/boot/arc/lib/elf_freebsd.c#2 (text+ko) ==== @@ -51,10 +51,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 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. @@ -75,7 +71,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.5 2004/01/04 23:28:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.6 2004/04/07 20:45:55 imp Exp $"); #include <stand.h> #include <string.h> ==== //depot/projects/netperf_socket/sys/boot/common/newvers.sh#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.3 2001/03/02 16:52:12 ru Exp $ +# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.4 2004/04/07 20:45:56 imp Exp $ # $NetBSD: newvers.sh,v 1.1 1997/07/26 01:50:38 thorpej Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -14,10 +14,6 @@ # 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. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by the University of -# California, Berkeley and its contributors. # 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. ==== //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.49 2004/04/05 08:26:52 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.50 2004/04/07 17:02:55 wpaul Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -777,6 +777,8 @@ block = &sc->ndis_block; dev = sc->ndis_dev; + SLIST_INIT(&brl_rev); + rl = malloc(sizeof(ndis_resource_list) + (sizeof(cm_partial_resource_desc) * (sc->ndis_rescnt - 1)), M_DEVBUF, M_NOWAIT|M_ZERO); @@ -805,7 +807,6 @@ * in order to fix this, we have to create our own * temporary list with the entries in reverse order. */ - SLIST_INIT(&brl_rev); SLIST_FOREACH(brle, brl, link) { n = malloc(sizeof(struct resource_list_entry), M_TEMP, M_NOWAIT); ==== //depot/projects/netperf_socket/sys/conf/files.pc98#7 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.290 2004/03/22 13:37:11 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.291 2004/04/07 05:44:50 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -196,10 +196,6 @@ i386/ibcs2/imgact_coff.c optional ibcs2 i386/isa/atpic.c standard i386/isa/atpic_vector.s standard -i386/isa/bs/bs.c optional bs -i386/isa/bs/bsfunc.c optional bs -i386/isa/bs/bshw.c optional bs -i386/isa/bs/bsif.c count bs i386/isa/cy.c count cy i386/isa/elink.c optional ep i386/isa/elink.c optional ie ==== //depot/projects/netperf_socket/sys/conf/newvers.sh#2 (text+ko) ==== @@ -11,10 +11,6 @@ # 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. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by the University of -# California, Berkeley and its contributors. # 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. @@ -32,7 +28,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.60 2004/01/11 14:13:29 ru Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.61 2004/04/07 20:45:56 imp Exp $ TYPE="FreeBSD" REVISION="5.2" ==== //depot/projects/netperf_socket/sys/conf/systags.sh#3 (text+ko) ==== @@ -11,10 +11,6 @@ # 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. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by the University of -# California, Berkeley and its contributors. # 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. @@ -32,7 +28,7 @@ # SUCH DAMAGE. # # @(#)systags.sh 8.1 (Berkeley) 6/10/93 -# $FreeBSD: src/sys/conf/systags.sh,v 1.8 2004/01/29 14:58:22 kensmith Exp $ +# $FreeBSD: src/sys/conf/systags.sh,v 1.9 2004/04/07 20:45:56 imp Exp $ # # systags.sh - construct a system tags file using dependence relations # in a .depend file ==== //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/fil.c#2 (text+ko) ==== @@ -99,7 +99,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.36 2003/02/19 05:47:00 imp Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.37 2004/04/07 20:45:56 imp Exp $"; #endif #ifndef _KERNEL @@ -1526,10 +1526,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 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. ==== //depot/projects/netperf_socket/sys/ddb/db_ps.c#3 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 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. @@ -32,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.50 2004/02/27 18:52:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.51 2004/04/07 20:45:56 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.9 2004/03/31 17:35:28 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.10 2004/04/07 19:42:21 jhb Exp $"); #include "opt_bus.h" @@ -69,11 +69,8 @@ device_t child, char *buf, size_t buflen); -#if 0 static int acpi_pci_set_powerstate_method(device_t dev, device_t child, int state); -static int acpi_pci_get_powerstate_method(device_t dev, device_t child); -#endif static ACPI_STATUS acpi_pci_save_handle(ACPI_HANDLE handle, UINT32 level, void *context, void **status); @@ -112,9 +109,8 @@ DEVMETHOD(pci_disable_busmaster, pci_disable_busmaster_method), DEVMETHOD(pci_enable_io, pci_enable_io_method), DEVMETHOD(pci_disable_io, pci_disable_io_method), - /* XXX: We should override these two. */ DEVMETHOD(pci_get_powerstate, pci_get_powerstate_method), - DEVMETHOD(pci_set_powerstate, pci_set_powerstate_method), + DEVMETHOD(pci_set_powerstate, acpi_pci_set_powerstate_method), DEVMETHOD(pci_assign_interrupt, pci_assign_interrupt_method), { 0, 0 } @@ -159,24 +155,58 @@ return (0); } -#if 0 /* * PCI power manangement */ static int acpi_pci_set_powerstate_method(device_t dev, device_t child, int state) { - /* XXX: TODO */ - return (ENXIO); -} + ACPI_STATUS status; + int acpi_state, old_state, error; + + switch (state) { + case PCI_POWERSTATE_D0: + acpi_state = ACPI_STATE_D0; + break; + case PCI_POWERSTATE_D1: + acpi_state = ACPI_STATE_D1; + break; + case PCI_POWERSTATE_D2: + acpi_state = ACPI_STATE_D2; + break; + case PCI_POWERSTATE_D3: + acpi_state = ACPI_STATE_D3; + break; + default: + return (EINVAL); + } -static int -acpi_pci_get_powerstate_method(device_t dev, device_t child) -{ - /* XXX: TODO */ - return (ENXIO); + /* + * We set the state using PCI Power Management outside of setting + * the ACPI state. This means that when powering down a device, we + * first shut it down using PCI, and then using ACPI, which lets ACPI + * try to power down any Power Resources that are now no longer used. + * When powering up a device, we let ACPI set the state first so that + * it can enable any needed Power Resources before changing the PCI + * power state. + */ + old_state = pci_get_powerstate(child); + if (old_state < state) { + error = pci_set_powerstate_method(dev, child, state); + if (error) + return (error); + } + status = acpi_pwr_switch_consumer(acpi_get_handle(child), acpi_state); + if (ACPI_FAILURE(status)) + device_printf(dev, + "Failed to set ACPI power state D%d on %s: %s\n", + acpi_state, device_get_nameunit(child), + AcpiFormatException(status)); + if (state > old_state) + return (pci_set_powerstate_method(dev, child, state)); + else + return (0); } -#endif static ACPI_STATUS acpi_pci_save_handle(ACPI_HANDLE handle, UINT32 level, void *context, ==== //depot/projects/netperf_socket/sys/dev/fb/gallant12x22.h#2 (text+ko) ==== @@ -17,10 +17,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 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. @@ -39,7 +35,7 @@ * * Derived from: @(#)gallant19.h 8.1 (Berkeley) 6/11/93 * - * $FreeBSD: src/sys/dev/fb/gallant12x22.h,v 1.1 2003/08/24 01:15:39 jake Exp $ + * $FreeBSD: src/sys/dev/fb/gallant12x22.h,v 1.2 2004/04/07 20:45:57 imp Exp $ */ static u_char gallant12x22_data[] = { ==== //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.201 2004/03/17 17:50:33 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.202 2004/04/07 15:47:14 imp Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -168,6 +168,7 @@ { 0x103D, -1, "Intel 82801DB (ICH4) Pro/100 VE Ethernet" }, { 0x103E, -1, "Intel 82801DB (ICH4) Pro/100 VM Ethernet" }, { 0x1050, -1, "Intel 82801BA (D865) Pro/100 VE Ethernet" }, + { 0x1051, -1, "Intel 82562ET (ICH5/ICH5R) Pro/100 VE Ethernet" }, { 0x1059, -1, "Intel 82551QM Pro/100 M Mobile Connection" }, { 0x1209, -1, "Intel 82559ER Embedded 10/100 Ethernet" }, { 0x1229, 0x01, "Intel 82557 Pro/100 Ethernet" }, ==== //depot/projects/netperf_socket/sys/dev/ic/i8251.h#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 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. @@ -30,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ic/i8251.h,v 1.1 2001/06/10 04:28:38 nyan Exp $ + * $FreeBSD: src/sys/dev/ic/i8251.h,v 1.2 2004/04/07 20:45:57 imp Exp $ */ /* ==== //depot/projects/netperf_socket/sys/dev/ic/nec765.h#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 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. @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)nec765.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/dev/ic/nec765.h,v 1.10 2001/12/16 07:52:13 joerg Exp $ + * $FreeBSD: src/sys/dev/ic/nec765.h,v 1.11 2004/04/07 20:45:57 imp Exp $ */ /* ==== //depot/projects/netperf_socket/sys/dev/ic/ns16550.h#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 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. @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)ns16550.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/dev/ic/ns16550.h,v 1.14 2003/09/16 14:21:17 bde Exp $ + * $FreeBSD: src/sys/dev/ic/ns16550.h,v 1.15 2004/04/07 20:45:57 imp Exp $ */ /* ==== //depot/projects/netperf_socket/sys/dev/md/md.c#12 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.120 2004/04/03 09:16:25 alc Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.121 2004/04/07 20:45:57 imp Exp $ * */ @@ -19,10 +19,6 @@ * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. * - * This code is derived from software contributed to Berkeley by - * the Systems Programming Group of the University of Utah Computer - * Science Department. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -31,10 +27,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 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. ==== //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#4 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 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. @@ -33,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.21 2004/03/11 12:58:54 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.22 2004/04/07 20:45:57 imp Exp $"); /* * Pseudo-nulmodem driver ==== //depot/projects/netperf_socket/sys/dev/ofw/openfirmio.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: openfirmio.c,v 1.4 2002/09/06 13:23:19 gehenna Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirmio.c,v 1.8 2004/02/21 21:10:45 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirmio.c,v 1.9 2004/04/07 20:45:57 imp Exp $"); /* * Copyright (c) 1992, 1993 @@ -24,10 +24,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 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 >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404080240.i382eABD011400>