From owner-p4-projects@FreeBSD.ORG Sun Jan 18 02:32:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C68F416A4D0; Sun, 18 Jan 2004 02:32:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A4BE16A4CE for ; Sun, 18 Jan 2004 02:32:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98F0643D31 for ; Sun, 18 Jan 2004 02:32:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0IAWG0B012764 for ; Sun, 18 Jan 2004 02:32:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0IAWGYx012758 for perforce@freebsd.org; Sun, 18 Jan 2004 02:32:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 18 Jan 2004 02:32:16 -0800 (PST) Message-Id: <200401181032.i0IAWGYx012758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 45527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jan 2004 10:32:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=45527 Change 45527 by jmallett@jmallett_oingo on 2004/01/18 02:31:59 Cleanup attempts, etc. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#12 edit .. //depot/projects/mips/sys/mips/mips/tlb.c#20 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#12 (text+ko) ==== @@ -204,6 +204,7 @@ nop nop eret + .set at VEND(XTLBMissVector) /* ==== //depot/projects/mips/sys/mips/mips/tlb.c#20 (text+ko) ==== @@ -153,8 +153,8 @@ tlb_remove_pages(pmap, va, eva - va); } -static void -tlb_insert(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1) +void +tlb_update(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1) { u_long ehi; int i; @@ -212,13 +212,6 @@ tlb_invalidate_one(va); } -void -tlb_update(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1) -{ - va &= ~PAGE_MASK; - tlb_insert(va, pte0, pte1); -} - /* * PTE was not dirty and is being written to. XXX kernel only for now. */ @@ -238,19 +231,8 @@ panic("write to invalid page"); if (pte_ro(pte)) panic("write to ro page"); - - /* - * XXX I don't like these, but it looks like the fact of the - * matter is that they happen, for example I have something in - * front of me right now where the even side of the buffer is - * dirty, and so is the odd side, but in the buffer, the left - * side is marked, and there's some reason why a reload didn't - * happen, so just let it go... let it go... - */ -#if 0 if (pte_dirty(pte)) panic("dirty page caused a TLBMod"); -#endif /* * Mark the page dirty. From owner-p4-projects@FreeBSD.ORG Sun Jan 18 02:47:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 56BC516A4CE; Sun, 18 Jan 2004 02:47:17 -0800 (PST) Received: from agrenoble-203-1-29-230.w83-112.abo.wanadoo.fr (AGrenoble-203-1-29-230.w83-112.abo.wanadoo.fr [83.112.26.230]) by mx1.FreeBSD.org (Postfix) with SMTP id 5A7A043D3F; Sun, 18 Jan 2004 02:46:40 -0800 (PST) (envelope-from hgtozf@india.com) Received: from [83.112.26.230] by e-hostzz.comIP with HTTP; Sun, 18 Jan 2004 02:46:00 +0400 From: "Pittman" To: owner-freebsd-isp@freebsd.org, owner-freebsd-mobile@freebsd.org, p4-projects@freebsd.org, orion@freebsd.org, owner-freebsd-announce@freebsd.org, owner-freebsd-questions@freebsd.org, owner-p4-projects@freebsd.org, owner-freebsd-gnome@freebsd.org Mime-Version: 1.0 X-Mailer: mPOP Web-Mail 2.19 X-Originating-IP: [e-hostzz.comIP] Date: Sat, 17 Jan 2004 23:41:00 +0100 Message-Id: Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit X-Content-Filtered-By: Mailman/MimeDel 2.1.1 Subject: Re: ZE, decided to accept X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Samantha List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jan 2004 10:47:17 -0000 pinch drury adsorptive citric ahmadabad betwixt ralph panic onlooking coo salmonberry decompression indeed drug callaghan clue ar transient becloud doltish walkway hear smithsonian neophyte jove ok From owner-p4-projects@FreeBSD.ORG Sun Jan 18 09:47:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B143516A4D0; Sun, 18 Jan 2004 09:47:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A90916A4CE for ; Sun, 18 Jan 2004 09:47:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9912D43D39 for ; Sun, 18 Jan 2004 09:47:44 -0800 (PST) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0IHli0B023060 for ; Sun, 18 Jan 2004 09:47:44 -0800 (PST) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0IHliK5023057 for perforce@freebsd.org; Sun, 18 Jan 2004 09:47:44 -0800 (PST) (envelope-from scottl@freebsd.org) Date: Sun, 18 Jan 2004 09:47:44 -0800 (PST) Message-Id: <200401181747.i0IHliK5023057@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 45543 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jan 2004 17:47:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=45543 Change 45543 by scottl@scottl_netperf_socket on 2004/01/18 09:46:57 Populate the new netperf_socket tree. This will be the new funnel for getting network and socket locking into CVS. Affected files ... .. //depot/projects/netperf_socket/sys/Makefile#1 branch .. //depot/projects/netperf_socket/sys/alpha/Makefile#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/alpha-gdbstub.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/atomic.s#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/autoconf.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/busspace.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/clock.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/clock_if.m#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/critical.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/db_interface.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/db_trace.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/divrem.m4#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/exception.s#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/genassym.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/interrupt.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/locore.s#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/mem.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/pal.s#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/prom.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/sgmap.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/support.s#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/swtch.s#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/timerreg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/trap.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/compile/.cvsignore#1 branch .. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#1 branch .. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/netperf_socket/sys/alpha/conf/Makefile#1 branch .. //depot/projects/netperf_socket/sys/alpha/conf/NOTES#1 branch .. //depot/projects/netperf_socket/sys/alpha/conf/gethints.awk#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/_inttypes.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/_limits.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/_types.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/asm.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/atomic.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/bootinfo.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/bus.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/bus_memio.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/bus_pio.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/bwx.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/chipset.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/clock.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/clockvar.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/cpu.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/cpuconf.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/cpufunc.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/critical.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/db_machdep.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/elf.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/endian.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/exec.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/float.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/floatingpoint.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/fpu.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/frame.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/ieee.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/ieeefp.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/in_cksum.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/inst.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/intr.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/intrcnt.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/limits.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/md_var.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/mutex.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/pal.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/param.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/pc/bios.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/pc/display.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/pc/msdos.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/pc/vesa.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/pcb.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/pcpu.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/pmap.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/proc.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/profile.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/prom.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/pte.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/ptrace.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/reg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/reloc.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/resource.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/rpb.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/runq.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/setjmp.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/sf_buf.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/sgmap.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/sigframe.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/signal.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/smp.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/stdarg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/swiz.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/sysarch.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/ucontext.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/varargs.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/vmparam.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/isa/isa.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/isa/isa_dma.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/isa/isavar.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/linux/Makefile#1 branch .. //depot/projects/netperf_socket/sys/alpha/linux/linux.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/linux/linux_locore.s#1 branch .. //depot/projects/netperf_socket/sys/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/linux/linux_proto.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/linux/syscalls.conf#1 branch .. //depot/projects/netperf_socket/sys/alpha/linux/syscalls.master#1 branch .. //depot/projects/netperf_socket/sys/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/Makefile#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/netperf_socket/sys/alpha/osf1/syscalls.master#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/apecs.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/apecsreg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/apecsvar.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/bwx.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/cia.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/cia_pci.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/ciareg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/ciavar.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/irongate.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/irongatereg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/irongatevar.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/lca.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/lca_pci.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/lcareg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/lcavar.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/pcibus.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/pcibus.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/swiz.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/t2.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/t2_pci.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/t2reg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/t2var.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/tsunami.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/gbus.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/Makefile#1 branch .. //depot/projects/netperf_socket/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/amd64-gdbstub.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/critical.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/support.S#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/netperf_socket/sys/amd64/conf/Makefile#1 branch .. //depot/projects/netperf_socket/sys/amd64/conf/gethints.awk#1 branch .. //depot/projects/netperf_socket/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/netperf_socket/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/netperf_socket/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/_limits.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/_types.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/asm.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/atomic.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/bus.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/bus_amd64.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/bus_memio.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/bus_pio.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/clock.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/cpu.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/critical.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/elf.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/endian.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/exec.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/float.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/fpu.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/frame.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/limits.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/md_var.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/metadata.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/mptable.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/mutex.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/param.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/pcb.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/pcvt_ioctl.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/pmap.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/proc.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/profile.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/psl.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/reg.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/reloc.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/resource.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/runq.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/segments.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/signal.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/smp.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/trap.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/tss.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/varargs.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/netperf_socket/sys/amd64/isa/clock.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/isa/icu.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/isa/isa.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/isa/isa.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/isa/isa_dma.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/isa/timerreg.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/netperf_socket/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/netperf_socket/sys/arm/include/_limits.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/_stdint.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/_types.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/elf.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/endian.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/exec.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/limits.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/param.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/signal.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/ucontext.h#1 branch .. //depot/projects/netperf_socket/sys/boot/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/README#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/Makefile.inc#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/boot1/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/boot1/boot1.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/cdboot/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/cdboot/version#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/common/Makefile.common#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/common/conf.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/common/help.alpha#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/common/main.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/OSFpal.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/alpha_copy.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/alpha_module.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/bbinfo.h#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/bootinfo.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/common.h#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/delay.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/devicename.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/elf_freebsd.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/getsecs.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/libalpha.h#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/pal.S#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/prom.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/prom_disp.S#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/prom_swpal.S#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/reboot.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/srmdisk.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/srmnet.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/start.S#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/time.c#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/loader/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/loader/version#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/netboot/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/alpha/netboot/version#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/Makefile.inc#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/include/arcfuncs.h#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/include/arctypes.h#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/include/libarc.h#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/abort.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/arcconsole.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/arcdisk.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/arch/alpha/copy.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/arch/alpha/rpb.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/arch/alpha/setjmp.S#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/arch/alpha/start.S#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/bootinfo.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/delay.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/devicename.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/elf_freebsd.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/module.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/prom.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/setjmperr.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/lib/time.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/loader/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/loader/conf.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/loader/help.alpha#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/loader/main.c#1 branch .. //depot/projects/netperf_socket/sys/boot/arc/loader/version#1 branch .. //depot/projects/netperf_socket/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/netperf_socket/sys/boot/common/bcache.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/boot.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/netperf_socket/sys/boot/common/commands.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/console.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/dev_net.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/dev_net.h#1 branch .. //depot/projects/netperf_socket/sys/boot/common/devopen.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/help.common#1 branch .. //depot/projects/netperf_socket/sys/boot/common/interp.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/isapnp.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/isapnp.h#1 branch .. //depot/projects/netperf_socket/sys/boot/common/load.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/load_elf.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/loader.8#1 branch .. //depot/projects/netperf_socket/sys/boot/common/ls.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/netperf_socket/sys/boot/common/misc.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/module.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/newvers.sh#1 branch .. //depot/projects/netperf_socket/sys/boot/common/panic.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/pnp.c#1 branch .. //depot/projects/netperf_socket/sys/boot/common/pnpdata#1 branch .. //depot/projects/netperf_socket/sys/boot/common/ufsread.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/README#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/arch/ia64/start.S#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/copy.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/module.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/loader/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/loader/conf.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/loader/main.c#1 branch .. //depot/projects/netperf_socket/sys/boot/efi/loader/version#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/alpha/sysdep.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/alpha/sysdep.h#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/dict.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/float.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/loader.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/math64.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/math64.h#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/search.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/stack.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/tools.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/unix.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/vm.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ficl/words.c#1 branch .. //depot/projects/netperf_socket/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/netperf_socket/sys/boot/forth/frames.4th#1 branch .. //depot/projects/netperf_socket/sys/boot/forth/loader.4th#1 branch .. //depot/projects/netperf_socket/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#1 branch .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/netperf_socket/sys/boot/forth/loader.rc#1 branch .. //depot/projects/netperf_socket/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/netperf_socket/sys/boot/forth/screen.4th#1 branch .. //depot/projects/netperf_socket/sys/boot/forth/support.4th#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0sio.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/boot2/boot1.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/boot2/sio.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/btx.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/btxldr.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/gatea20.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/loader/version#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/pxeldr.s#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/acpi_stub.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/bootinfo.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/copy.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/delay.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/devicename.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/efi_stub.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/elf_freebsd.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/exit.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/libski.h#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/module.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/pal_stub.S#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/sal_stub.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/skiconsole.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/skifs.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/ssc.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/libski/time.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/conf.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/ldscript.ia64#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/main.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/skiload.cmd#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/start.S#1 branch .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/version#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/btx.s#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/btxldr.s#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/gatea20.c#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/netperf_socket/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/netperf_socket/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/netperf_socket/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/netperf_socket/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/netperf_socket/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/netperf_socket/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/sparc64/boot1/_start.S#1 branch .. //depot/projects/netperf_socket/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/netperf_socket/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/netperf_socket/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/netperf_socket/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/netperf_socket/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/netperf_socket/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/netperf_socket/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/netperf_socket/sys/cam/cam.c#1 branch .. //depot/projects/netperf_socket/sys/cam/cam.h#1 branch .. //depot/projects/netperf_socket/sys/cam/cam_ccb.h#1 branch .. //depot/projects/netperf_socket/sys/cam/cam_debug.h#1 branch .. //depot/projects/netperf_socket/sys/cam/cam_periph.c#1 branch .. //depot/projects/netperf_socket/sys/cam/cam_periph.h#1 branch .. //depot/projects/netperf_socket/sys/cam/cam_queue.c#1 branch .. //depot/projects/netperf_socket/sys/cam/cam_queue.h#1 branch .. //depot/projects/netperf_socket/sys/cam/cam_sim.c#1 branch .. //depot/projects/netperf_socket/sys/cam/cam_sim.h#1 branch .. //depot/projects/netperf_socket/sys/cam/cam_xpt.c#1 branch .. //depot/projects/netperf_socket/sys/cam/cam_xpt.h#1 branch .. //depot/projects/netperf_socket/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/netperf_socket/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/netperf_socket/sys/coda/00READ#1 branch .. //depot/projects/netperf_socket/sys/coda/README#1 branch .. //depot/projects/netperf_socket/sys/coda/TODO#1 branch .. //depot/projects/netperf_socket/sys/coda/cnode.h#1 branch .. //depot/projects/netperf_socket/sys/coda/coda.h#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_io.h#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_kernel.h#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_namecache.c#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_namecache.h#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_opstats.h#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_psdev.c#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_psdev.h#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_subr.c#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_subr.h#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_venus.c#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_venus.h#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_vfsops.c#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_vfsops.h#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_vnops.c#1 branch .. //depot/projects/netperf_socket/sys/coda/coda_vnops.h#1 branch .. //depot/projects/netperf_socket/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/netperf_socket/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/netperf_socket/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/netperf_socket/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/netperf_socket/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/netperf_socket/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/netperf_socket/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/netperf_socket/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/netperf_socket/sys/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/projects/netperf_socket/sys/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/Makefile#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/imgact_svr4.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_acl.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_dirent.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_errno.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_exec.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_fcntl.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_fcntl.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_filio.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_filio.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_fuser.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_hrt.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ioctl.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ioctl.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ipc.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ipc.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_misc.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_mman.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_proto.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_resource.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_resource.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_siginfo.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_signal.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_signal.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_socket.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_socket.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sockio.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sockio.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sockmod.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_stat.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_stat.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_statvfs.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_stream.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_stropts.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_syscall.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_syscallnames.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sysconfig.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sysent.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_systeminfo.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sysvec.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_termios.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_termios.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_time.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_timod.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ttold.c#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ttold.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_types.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ucontext.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ulimit.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ustat.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_util.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_utsname.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_wait.h#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/syscalls.conf#1 branch .. //depot/projects/netperf_socket/sys/compat/svr4/syscalls.master#1 branch .. //depot/projects/netperf_socket/sys/conf/Makefile.alpha#1 branch .. //depot/projects/netperf_socket/sys/conf/Makefile.amd64#1 branch .. //depot/projects/netperf_socket/sys/conf/Makefile.i386#1 branch .. //depot/projects/netperf_socket/sys/conf/Makefile.ia64#1 branch .. //depot/projects/netperf_socket/sys/conf/Makefile.pc98#1 branch .. //depot/projects/netperf_socket/sys/conf/Makefile.powerpc#1 branch .. //depot/projects/netperf_socket/sys/conf/Makefile.sparc64#1 branch .. //depot/projects/netperf_socket/sys/conf/NOTES#1 branch .. //depot/projects/netperf_socket/sys/conf/defines#1 branch .. //depot/projects/netperf_socket/sys/conf/files#1 branch .. //depot/projects/netperf_socket/sys/conf/files.alpha#1 branch .. //depot/projects/netperf_socket/sys/conf/files.amd64#1 branch .. //depot/projects/netperf_socket/sys/conf/files.i386#1 branch .. //depot/projects/netperf_socket/sys/conf/files.ia64#1 branch .. //depot/projects/netperf_socket/sys/conf/files.pc98#1 branch .. //depot/projects/netperf_socket/sys/conf/files.powerpc#1 branch .. //depot/projects/netperf_socket/sys/conf/files.sparc64#1 branch .. //depot/projects/netperf_socket/sys/conf/kern.mk#1 branch .. //depot/projects/netperf_socket/sys/conf/kern.post.mk#1 branch .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#1 branch .. //depot/projects/netperf_socket/sys/conf/kmod.mk#1 branch .. //depot/projects/netperf_socket/sys/conf/kmod_syms.awk#1 branch .. //depot/projects/netperf_socket/sys/conf/ldscript.alpha#1 branch .. //depot/projects/netperf_socket/sys/conf/ldscript.amd64#1 branch .. //depot/projects/netperf_socket/sys/conf/ldscript.i386#1 branch .. //depot/projects/netperf_socket/sys/conf/ldscript.ia64#1 branch .. //depot/projects/netperf_socket/sys/conf/ldscript.powerpc#1 branch .. //depot/projects/netperf_socket/sys/conf/ldscript.sparc64#1 branch .. //depot/projects/netperf_socket/sys/conf/majors#1 branch .. //depot/projects/netperf_socket/sys/conf/majors.awk#1 branch .. //depot/projects/netperf_socket/sys/conf/makeLINT.mk#1 branch .. //depot/projects/netperf_socket/sys/conf/makeLINT.sed#1 branch .. //depot/projects/netperf_socket/sys/conf/newvers.sh#1 branch .. //depot/projects/netperf_socket/sys/conf/options#1 branch .. //depot/projects/netperf_socket/sys/conf/options.alpha#1 branch .. //depot/projects/netperf_socket/sys/conf/options.amd64#1 branch .. //depot/projects/netperf_socket/sys/conf/options.i386#1 branch .. //depot/projects/netperf_socket/sys/conf/options.ia64#1 branch .. //depot/projects/netperf_socket/sys/conf/options.pc98#1 branch .. //depot/projects/netperf_socket/sys/conf/options.powerpc#1 branch .. //depot/projects/netperf_socket/sys/conf/options.sparc64#1 branch .. //depot/projects/netperf_socket/sys/conf/systags.sh#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/CHANGES.txt#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acapps.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acconfig.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acdebug.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acdisasm.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acdispat.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acefi.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acenv.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acevents.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acexcep.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acfreebsd.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acgcc.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acglobal.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/achware.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acinterp.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/aclocal.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acmacros.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acnamesp.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acobject.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acoutput.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acparser.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acpi.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acpica_prep.sh#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acpiosxf.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acpixf.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acresrc.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acstruct.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actables.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actbl.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actbl1.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actbl2.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actypes.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acutils.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/amlcode.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/amlresrc.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/common/adisasm.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/common/getopt.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslanalyze.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcodegen.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompile.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.l#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.y#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslerror.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslfiles.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslfold.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslglobal.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/asllength.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/asllisting.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslload.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 18 10:02:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7A0016A4D0; Sun, 18 Jan 2004 10:02:18 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 425BD16A4CE for ; Sun, 18 Jan 2004 10:02:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED23543D75 for ; Sun, 18 Jan 2004 10:01:01 -0800 (PST) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0II110B025447 for ; Sun, 18 Jan 2004 10:01:01 -0800 (PST) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0II10lG025443 for perforce@freebsd.org; Sun, 18 Jan 2004 10:01:00 -0800 (PST) (envelope-from scottl@freebsd.org) Date: Sun, 18 Jan 2004 10:01:00 -0800 (PST) Message-Id: <200401181801.i0II10lG025443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 45544 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jan 2004 18:02:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=45544 Change 45544 by scottl@scottl-netperf on 2004/01/18 10:00:47 IFC @45542 Affected files ... .. //depot/projects/netperf/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/netperf/sys/boot/forth/frames.4th#2 integrate .. //depot/projects/netperf/sys/boot/pc98/libpc98/vidconsole.c#3 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-chipset.c#17 integrate .. //depot/projects/netperf/sys/dev/ata/ata-pci.h#9 integrate .. //depot/projects/netperf/sys/dev/ata/ata-raid.c#9 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cam.c#12 integrate .. //depot/projects/netperf/sys/dev/ciss/ciss.c#9 integrate .. //depot/projects/netperf/sys/dev/gx/if_gx.c#5 integrate .. //depot/projects/netperf/sys/dev/ips/ips.c#4 integrate .. //depot/projects/netperf/sys/dev/mii/ukphy.c#3 integrate .. //depot/projects/netperf/sys/dev/mly/mly.c#5 integrate .. //depot/projects/netperf/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/netperf/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/netperf/sys/dev/sio/sio.c#11 integrate .. //depot/projects/netperf/sys/dev/sound/pci/neomagic-coeff.h#3 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/vchan.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/umass.c#8 integrate .. //depot/projects/netperf/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs.h#14 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs_data.h#14 integrate .. //depot/projects/netperf/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/netperf/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/netperf/sys/rpc/rpcclnt.c#4 integrate .. //depot/projects/netperf/sys/vm/uma_int.h#6 integrate .. //depot/projects/netperf/sys/vm/vm_object.c#14 integrate Differences ... ==== //depot/projects/netperf/sys/amd64/include/md_var.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.69 2003/11/17 08:58:14 peter Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.70 2004/01/17 13:13:48 phk Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -47,7 +47,6 @@ extern u_int cpu_id; extern u_int cpu_procinfo; extern char cpu_vendor[]; -extern uint16_t *elan_mmcr; extern char kstack[]; extern char sigcode[]; extern int szsigcode; ==== //depot/projects/netperf/sys/boot/forth/frames.4th#2 (text+ko) ==== @@ -1,6 +1,6 @@ \ Words implementing frame drawing \ XXX Filled boxes are left as an exercise for the reader... ;-/ -\ $FreeBSD: src/sys/boot/forth/frames.4th,v 1.1 2003/05/30 09:29:23 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/frames.4th,v 1.2 2004/01/18 04:13:27 nyan Exp $ marker task-frames.4th @@ -12,27 +12,49 @@ variable rb_el variable fill -\ Single frames -196 constant sh_el -179 constant sv_el -218 constant slt_el -192 constant slb_el -191 constant srt_el -217 constant srb_el -\ Double frames -205 constant dh_el -186 constant dv_el -201 constant dlt_el -200 constant dlb_el -187 constant drt_el -188 constant drb_el -\ Fillings -0 constant fill_none -32 constant fill_blank -176 constant fill_dark -177 constant fill_med -178 constant fill_bright - +s" arch-pc98" environment? [if] + \ Single frames + 149 constant sh_el + 150 constant sv_el + 152 constant slt_el + 154 constant slb_el + 153 constant srt_el + 155 constant srb_el + \ Double frames + 149 constant dh_el + 150 constant dv_el + 152 constant dlt_el + 154 constant dlb_el + 153 constant drt_el + 155 constant drb_el + \ Fillings + 0 constant fill_none + 32 constant fill_blank + 135 constant fill_dark + 135 constant fill_med + 135 constant fill_bright +[else] + \ Single frames + 196 constant sh_el + 179 constant sv_el + 218 constant slt_el + 192 constant slb_el + 191 constant srt_el + 217 constant srb_el + \ Double frames + 205 constant dh_el + 186 constant dv_el + 201 constant dlt_el + 200 constant dlb_el + 187 constant drt_el + 188 constant drb_el + \ Fillings + 0 constant fill_none + 32 constant fill_blank + 176 constant fill_dark + 177 constant fill_med + 178 constant fill_bright +[then] : hline ( len x y -- ) \ Draw horizontal single line at-xy \ move cursor ==== //depot/projects/netperf/sys/boot/pc98/libpc98/vidconsole.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/vidconsole.c,v 1.11 2003/09/08 09:11:20 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/vidconsole.c,v 1.12 2004/01/18 04:10:45 nyan Exp $"); #include #include @@ -422,7 +422,7 @@ { #ifdef PC98 - *crtat = (c == 0x5c ? 0xfc : c); + *crtat = (c == 0x5c ? 0xfc : (c & 0xff)); *(crtat + 0x1000) = at2pc98(fgcol, bgcol); #else v86.ctl = 0; ==== //depot/projects/netperf/sys/cam/scsi/scsi_sa.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.97 2003/09/13 02:01:56 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.98 2004/01/18 00:17:14 johan Exp $"); #include #include @@ -2403,7 +2403,7 @@ * Grotesque as it seems, the few times * I've actually seen a non-zero resid, * the tape drive actually lied and had - * writtent all the data!. + * written all the data!. */ csio->resid = 0; } ==== //depot/projects/netperf/sys/dev/ata/ata-chipset.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.56 2004/01/14 21:26:34 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.57 2004/01/17 23:34:13 sos Exp $"); #include "opt_ata.h" #include @@ -1585,7 +1585,8 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_SII3112, 0x02, SIIMEMIO, 0, ATA_SA150, "SiI 3112" }, + {{ ATA_SII3114, 0x00, SIIMEMIO, SII4CH, ATA_SA150, "SiI 3114" }, + { ATA_SII3112, 0x02, SIIMEMIO, 0, ATA_SA150, "SiI 3112" }, { ATA_SII3112_1, 0x02, SIIMEMIO, 0, ATA_SA150, "SiI 3112" }, { ATA_SII3112, 0x00, SIIMEMIO, SIIBUG, ATA_SA150, "SiI 3112" }, { ATA_SII3112_1, 0x00, SIIMEMIO, SIIBUG, ATA_SA150, "SiI 3112" }, @@ -1640,10 +1641,14 @@ ctlr->chip->text); } + if (ctlr->chip->cfg2 & SII4CH) + ctlr->channels = 4; + /* enable interrupt as BIOS might not */ pci_write_config(dev, 0x8a, (pci_read_config(dev, 0x8a, 1) & 0x3f), 1); /* setup chipset defaults as BIOS might not */ +#if 0 pci_write_config(dev, 0xa2, 0x328a, 2); pci_write_config(dev, 0xa4, 0x328a328a, 4); pci_write_config(dev, 0xa8, 0x22082208, 4); @@ -1652,7 +1657,7 @@ pci_write_config(dev, 0xe4, 0x328a328a, 4); pci_write_config(dev, 0xe8, 0x22082208, 4); pci_write_config(dev, 0xec, 0x40094009, 4); - +#endif ctlr->allocate = ata_sii_mio_allocate; if (ctlr->chip->max_dma >= ATA_SA150) ctlr->setmode = ata_sata_setmode; @@ -1685,24 +1690,25 @@ ata_sii_mio_allocate(device_t dev, struct ata_channel *ch) { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); + int unit01 = (ch->unit & 1), unit10 = (ch->unit & 2); int i; for (i = ATA_DATA; i <= ATA_STATUS; i++) { ch->r_io[i].res = ctlr->r_io2; - ch->r_io[i].offset = 0x80 + i + (ch->unit << 6); + ch->r_io[i].offset = 0x80 + i + (unit01 << 6) + (unit10 << 9); } ch->r_io[ATA_ALTSTAT].res = ctlr->r_io2; - ch->r_io[ATA_ALTSTAT].offset = 0x8a + (ch->unit << 6); + ch->r_io[ATA_ALTSTAT].offset = 0x8a + (unit01 << 6) + (unit10 << 9); ch->r_io[ATA_BMCMD_PORT].res = ctlr->r_io2; - ch->r_io[ATA_BMCMD_PORT].offset = 0x00 + (ch->unit << 3); + ch->r_io[ATA_BMCMD_PORT].offset = 0x00 + (unit01 << 3) + (unit10 << 9); ch->r_io[ATA_BMSTAT_PORT].res = ctlr->r_io2; - ch->r_io[ATA_BMSTAT_PORT].offset = 0x02 + (ch->unit << 3); + ch->r_io[ATA_BMSTAT_PORT].offset = 0x02 + (unit01 << 3) + (unit10 << 9); ch->r_io[ATA_BMDTP_PORT].res = ctlr->r_io2; - ch->r_io[ATA_BMDTP_PORT].offset = 0x04 + (ch->unit << 3); + ch->r_io[ATA_BMDTP_PORT].offset = 0x04 + (unit01 << 3) + (unit10 << 9); ch->r_io[ATA_BMDEVSPEC_0].res = ctlr->r_io2; - ch->r_io[ATA_BMDEVSPEC_0].offset = 0xa1 + (ch->unit << 6); + ch->r_io[ATA_BMDEVSPEC_0].offset = 0xa1 + (unit01 << 6) + (unit10 << 9); ch->r_io[ATA_BMDEVSPEC_1].res = ctlr->r_io2; - ch->r_io[ATA_BMDEVSPEC_1].offset = 0x100 + (ch->unit << 7); + ch->r_io[ATA_BMDEVSPEC_1].offset = 0x100 + (unit01 << 7) + (unit10 << 9); ch->r_io[ATA_IDX_ADDR].res = ctlr->r_io2; if (ctlr->chip->max_dma >= ATA_SA150) ==== //depot/projects/netperf/sys/dev/ata/ata-pci.h#9 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.20 2003/12/18 08:07:05 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.21 2004/01/17 23:34:13 sos Exp $ */ /* structure holding chipset config info */ @@ -158,9 +158,10 @@ #define ATA_CSB6_1 0x02171166 #define ATA_SILICON_IMAGE_ID 0x1095 -#define ATA_SII0680 0x06801095 +#define ATA_SII3114 0x31141095 #define ATA_SII3112 0x31121095 #define ATA_SII3112_1 0x02401095 +#define ATA_SII0680 0x06801095 #define ATA_CMD646 0x06461095 #define ATA_CMD648 0x06481095 #define ATA_CMD649 0x06491095 @@ -257,6 +258,7 @@ #define SIIINTR 0x01 #define SIISETCLK 0x02 #define SIIBUG 0x04 +#define SII4CH 0x08 #define SIS_SOUTH 1 #define SISSATA 2 ==== //depot/projects/netperf/sys/dev/ata/ata-raid.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.75 2004/01/14 21:26:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.77 2004/01/18 15:58:30 sos Exp $"); #include "opt_ata.h" #include @@ -1308,9 +1308,11 @@ sizeof(struct highpoint_raid_conf), (caddr_t)config, AR_WRITE)) { printf("ar%d: Highpoint write conf failed\n", rdp->lun); + free(config, M_AR); return -1; } } + free(config, M_AR); } return 0; } @@ -1603,9 +1605,11 @@ (caddr_t)config, AR_WRITE)) { printf("ar%d: %s write conf failed\n", rdp->lun, local ? "FreeBSD" : "Promise"); + free(config, M_AR); return -1; } } + free(config, M_AR); } return 0; } ==== //depot/projects/netperf/sys/dev/ata/atapi-cam.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.31 2004/01/14 21:26:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.32 2004/01/18 17:21:15 ru Exp $"); #include #include @@ -683,8 +683,10 @@ union ccb *ccb = malloc(sizeof(union ccb), M_ATACAM, M_WAITOK | M_ZERO); if (xpt_create_path(&path, xpt_periph, cam_sim_path(sim), - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) + CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { + free(ccb, M_ATACAM); return; + } CAM_DEBUG(ccb->ccb_h.path, CAM_DEBUG_TRACE, ("Rescanning ATAPI bus.\n")); xpt_setup_ccb(&ccb->ccb_h, path, 5/*priority (low)*/); ==== //depot/projects/netperf/sys/dev/ciss/ciss.c#9 (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/ciss/ciss.c,v 1.33 2003/12/13 07:54:07 ps Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.34 2004/01/18 16:55:01 ru Exp $ */ /* @@ -2167,6 +2167,7 @@ if (xpt_create_path(&sc->ciss_cam_path, xpt_periph, cam_sim_path(sc->ciss_cam_sim), target, 0) != CAM_REQ_CMP) { ciss_printf(sc, "rescan failed (can't create path)\n"); + free(ccb, M_TEMP); return; } ==== //depot/projects/netperf/sys/dev/gx/if_gx.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gx/if_gx.c,v 1.13 2003/10/31 18:32:01 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gx/if_gx.c,v 1.14 2004/01/18 10:15:48 yar Exp $"); #include #include @@ -350,13 +350,13 @@ ifp->if_init = gx_init; ifp->if_mtu = ETHERMTU; ifp->if_snd.ifq_maxlen = GX_TX_RING_CNT - 1; - ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING; + ifp->if_capabilities = IFCAP_VLAN_HWTAGGING; /* see if we can enable hardware checksumming */ - if (gx->gx_vflags & GXF_CSUM) { - ifp->if_capabilities = IFCAP_HWCSUM; - ifp->if_capenable = ifp->if_capabilities; - } + if (gx->gx_vflags & GXF_CSUM) + ifp->if_capabilities |= IFCAP_HWCSUM; + + ifp->if_capenable = ifp->if_capabilities; /* figure out transciever type */ if (gx->gx_vflags & GXF_FORCE_TBI || ==== //depot/projects/netperf/sys/dev/ips/ips.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ips/ips.c,v 1.6 2003/11/27 08:37:36 mbr Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ips/ips.c,v 1.7 2004/01/18 17:34:11 ru Exp $"); #include #include @@ -169,6 +169,7 @@ mask = splbio(); if(sc->state & IPS_OFFLINE){ splx(mask); + free(waiter, M_DEVBUF); return EIO; } command = SLIST_FIRST(&sc->free_cmd_list); ==== //depot/projects/netperf/sys/dev/mii/ukphy.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.14 2003/08/24 17:54:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.15 2004/01/17 10:44:39 phk Exp $"); /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. @@ -74,7 +74,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.14 2003/08/24 17:54:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.15 2004/01/17 10:44:39 phk Exp $"); #include #include @@ -167,6 +167,7 @@ printf("\n"); MIIBUS_MEDIAINIT(sc->mii_dev); + mii_phy_setmedia(sc); return(0); } ==== //depot/projects/netperf/sys/dev/mly/mly.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mly/mly.c,v 1.31 2003/09/02 17:30:36 jhb Exp $ + * $FreeBSD: src/sys/dev/mly/mly.c,v 1.32 2004/01/18 12:49:36 ru Exp $ */ #include @@ -2031,6 +2031,7 @@ if (xpt_create_path(&sc->mly_cam_path, xpt_periph, cam_sim_path(sc->mly_cam_sim[bus]), target, 0) != CAM_REQ_CMP) { mly_printf(sc, "rescan failed (can't create path)\n"); + free(ccb, M_TEMP); return; } xpt_setup_ccb(&ccb->ccb_h, sc->mly_cam_path, 5/*priority (low)*/); ==== //depot/projects/netperf/sys/dev/pci/pci_pci.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.29 2004/01/11 06:52:31 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.30 2004/01/17 21:54:04 imp Exp $"); /* * PCI:PCI bridge support. @@ -321,11 +321,12 @@ } } else { ok = 1; +#if 0 if (start < sc->iobase && end > sc->iolimit) { start = sc->iobase; end = sc->iolimit; } - +#endif } if (end < start) { device_printf(dev, "ioport: end (%lx) < start (%lx)\n", end, start); @@ -376,6 +377,7 @@ } } else if (!ok) { ok = 1; /* subtractive bridge: always ok */ +#if 0 if (pcib_is_nonprefetch_open(sc)) { if (start < sc->membase && end > sc->memlimit) { start = sc->membase; @@ -388,6 +390,7 @@ end = sc->pmemlimit; } } +#endif } if (end < start) { device_printf(dev, "memory: end (%lx) < start (%lx)\n", end, start); ==== //depot/projects/netperf/sys/dev/ppbus/vpo.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/vpo.c,v 1.29 2003/08/24 17:54:16 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/vpo.c,v 1.31 2004/01/18 13:09:38 ru Exp $"); #include #include @@ -191,6 +191,7 @@ if (xpt_create_path(&path, xpt_periph, cam_sim_path(vpo->sim), 0, 0) != CAM_REQ_CMP) { /* A failure is benign as the user can do a manual rescan */ + free(ccb, M_TEMP); return; } ==== //depot/projects/netperf/sys/dev/sio/sio.c#11 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.417 2003/12/24 04:11:10 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.418 2004/01/18 12:26:33 ru Exp $"); #include "opt_comconsole.h" #include "opt_compat.h" @@ -508,8 +508,10 @@ return (ENXIO); com = malloc(sizeof(*com), M_DEVBUF, M_NOWAIT | M_ZERO); - if (com == NULL) + if (com == NULL) { + bus_release_resource(dev, SYS_RES_IOPORT, rid, port); return (ENOMEM); + } device_set_softc(dev, com); com->bst = rman_get_bustag(port); com->bsh = rman_get_bushandle(port); ==== //depot/projects/netperf/sys/dev/sound/pci/neomagic-coeff.h#3 (text+ko) ==== @@ -25,12 +25,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/neomagic-coeff.h,v 1.2 2003/09/07 16:28:03 cg Exp $ + * $FreeBSD: src/sys/dev/sound/pci/neomagic-coeff.h,v 1.3 2004/01/17 10:37:10 phk Exp $ */ #define NM_TOTAL_COEFF_COUNT 0x3158 -static char coefficients[NM_TOTAL_COEFF_COUNT * 4] = { +static u_char coefficients[NM_TOTAL_COEFF_COUNT * 4] = { 0xFF, 0xFF, 0x2F, 0x00, 0x4B, 0xFF, 0xA5, 0x01, 0xEF, 0xFC, 0x21, 0x05, 0x87, 0xF7, 0x62, 0x11, 0xE9, 0x45, 0x5E, 0xF9, 0xB5, 0x01, 0xDE, 0xFF, 0xA4, 0xFF, 0x60, 0x00, 0xCA, 0xFF, 0x0D, 0x00, 0xFD, ==== //depot/projects/netperf/sys/dev/sound/pcm/dsp.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.67 2003/11/11 05:38:28 scottl Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.68 2004/01/17 10:37:11 phk Exp $"); #define OLDPCM_IOCTL @@ -455,15 +455,11 @@ * on dsp devices. */ - if (IOCGROUP(cmd) == 'M') { - dev_t pdev; - - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(PCMUNIT(i_dev), SND_DEV_CTL, 0)); - return mixer_ioctl(pdev, cmd, arg, mode, td); - } + d = dsp_get_info(i_dev); + if (IOCGROUP(cmd) == 'M') + return mixer_ioctl(d->mixer_dev, cmd, arg, mode, td); s = spltty(); - d = dsp_get_info(i_dev); getchns(i_dev, &rdch, &wrch, 0); kill = 0; @@ -580,7 +576,7 @@ (wrch? chn_getformats(wrch) : 0xffffffff); if (rdch && wrch) p->formats |= (dsp_get_flags(i_dev) & SD_F_SIMPLEX)? 0 : AFMT_FULLDUPLEX; - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(PCMUNIT(i_dev), SND_DEV_CTL, 0)); + pdev = d->mixer_dev; p->mixers = 1; /* default: one mixer */ p->inputs = pdev->si_drv1? mix_getdevs(pdev->si_drv1) : 0; p->left = p->right = 100; @@ -1051,12 +1047,26 @@ int dsp_register(int unit, int channel) { - make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_DSP, channel), + dev_t dt; + int r; + + dt = make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_DSP, channel), UID_ROOT, GID_WHEEL, 0666, "dsp%d.%d", unit, channel); - make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_DSP16, channel), + r = pcm_regdevt(dt, unit, SND_DEV_DSP, channel); + if (r) + return r; + + dt = make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_DSP16, channel), UID_ROOT, GID_WHEEL, 0666, "dspW%d.%d", unit, channel); - make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_AUDIO, channel), + r = pcm_regdevt(dt, unit, SND_DEV_DSP16, channel); + if (r) + return r; + + dt = make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_AUDIO, channel), UID_ROOT, GID_WHEEL, 0666, "audio%d.%d", unit, channel); + r = pcm_regdevt(dt, unit, SND_DEV_AUDIO, channel); + if (r) + return r; return 0; } @@ -1064,23 +1074,46 @@ int dsp_registerrec(int unit, int channel) { - make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_DSPREC, channel), + dev_t dt; + int r; + + dt = make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_DSPREC, channel), UID_ROOT, GID_WHEEL, 0666, "dspr%d.%d", unit, channel); - return 0; + r = pcm_regdevt(dt, unit, SND_DEV_DSPREC, channel); + + return r; } int dsp_unregister(int unit, int channel) { dev_t pdev; + int r; - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(unit, SND_DEV_DSP, channel)); + pdev = pcm_getdevt(unit, SND_DEV_DSP, channel); + if (pdev == NULL) + return ENOENT; destroy_dev(pdev); - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(unit, SND_DEV_DSP16, channel)); + r = pcm_unregdevt(unit, SND_DEV_DSP, channel); + if (r) + return r; + + pdev = pcm_getdevt(unit, SND_DEV_DSP16, channel); + if (pdev == NULL) + return ENOENT; destroy_dev(pdev); - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(unit, SND_DEV_AUDIO, channel)); + r = pcm_unregdevt(unit, SND_DEV_DSP16, channel); + if (r) + return r; + + pdev = pcm_getdevt(unit, SND_DEV_AUDIO, channel); + if (pdev == NULL) + return ENOENT; destroy_dev(pdev); + r = pcm_unregdevt(unit, SND_DEV_AUDIO, channel); + if (r) + return r; return 0; } @@ -1089,11 +1122,15 @@ dsp_unregisterrec(int unit, int channel) { dev_t pdev; + int r; - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(unit, SND_DEV_DSPREC, channel)); + pdev = pcm_getdevt(unit, SND_DEV_DSPREC, channel); + if (pdev == NULL) + return ENOENT; destroy_dev(pdev); + r = pcm_unregdevt(unit, SND_DEV_DSPREC, channel); - return 0; + return r; } #ifdef USING_DEVFS @@ -1126,7 +1163,7 @@ cont = 1; for (i = 0; cont; i++) { - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(unit, devtype, i)); + pdev = pcm_getdevt(unit, devtype, i); if (pdev->si_flags & SI_NAMED) { if ((pdev->si_drv1 == NULL) && (pdev->si_drv2 == NULL)) { *dev = pdev; ==== //depot/projects/netperf/sys/dev/sound/pcm/mixer.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.33 2003/11/11 05:38:28 scottl Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.34 2004/01/17 10:37:11 phk Exp $"); MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); @@ -87,13 +87,11 @@ static dev_t mixer_get_devt(device_t dev) { - dev_t pdev; - int unit; + struct snddev_info *snddev; - unit = device_get_unit(dev); - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(unit, SND_DEV_CTL, 0)); + snddev = device_get_softc(dev); - return pdev; + return snddev->mixer_dev; } #ifdef SND_DYNSYSCTL @@ -187,6 +185,7 @@ int mixer_init(device_t dev, kobj_class_t cls, void *devinfo) { + struct snddev_info *snddev; struct snd_mixer *m; u_int16_t v; dev_t pdev; @@ -213,6 +212,8 @@ pdev = make_dev(&mixer_cdevsw, PCMMKMINOR(unit, SND_DEV_CTL, 0), UID_ROOT, GID_WHEEL, 0666, "mixer%d", unit); pdev->si_drv1 = m; + snddev = device_get_softc(dev); + snddev->mixer_dev = pdev; return 0; @@ -478,14 +479,14 @@ static void mixer_clone(void *arg, char *name, int namelen, dev_t *dev) { - dev_t pdev; + struct snddev_info *sd; if (*dev != NODEV) return; if (strcmp(name, "mixer") == 0) { - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(snd_unit, SND_DEV_CTL, 0)); - if (pdev->si_flags & SI_NAMED) - *dev = pdev; + sd = devclass_get_softc(pcm_devclass, snd_unit); + if (sd != NULL) + *dev = sd->mixer_dev; } } ==== //depot/projects/netperf/sys/dev/sound/pcm/sound.c#5 (text+ko) ==== @@ -31,30 +31,8 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.86 2003/12/08 01:08:03 truckman Exp $"); - -#ifndef PCM_DEBUG_MTX -struct snddev_channel { - SLIST_ENTRY(snddev_channel) link; - struct pcm_channel *channel; -}; +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.87 2004/01/17 10:37:11 phk Exp $"); -struct snddev_info { - SLIST_HEAD(, snddev_channel) channels; - struct pcm_channel *fakechan; - unsigned devcount, playcount, reccount, vchancount; - unsigned flags; - int inprog; - unsigned int bufsz; - void *devinfo; - device_t dev; - char status[SND_STATUSLEN]; - struct sysctl_ctx_list sysctl_tree; - struct sysctl_oid *sysctl_tree_top; - struct mtx *lock; -}; -#endif - devclass_t pcm_devclass; int pcm_veto_load = 1; @@ -475,6 +453,7 @@ { struct snddev_channel *sce; int unit = device_get_unit(d->dev); +#if 0 int ourlock; ourlock = 0; @@ -482,13 +461,16 @@ snd_mtxlock(d->lock); ourlock = 1; } +#endif SLIST_FOREACH(sce, &d->channels, link) { if (sce->channel == ch) goto gotit; } +#if 0 if (ourlock) snd_mtxunlock(d->lock); +#endif return EINVAL; gotit: SLIST_REMOVE(&d->channels, sce, snddev_channel, link); @@ -505,8 +487,10 @@ else d->playcount--; +#if 0 if (ourlock) snd_mtxunlock(d->lock); +#endif free(sce, M_DEVBUF); return 0; @@ -554,9 +538,7 @@ struct pcm_channel *ch; int error = 0; - snd_mtxlock(d->lock); sce = SLIST_FIRST(&d->channels); - snd_mtxunlock(d->lock); ch = sce->channel; error = pcm_chn_remove(d, sce->channel, SLIST_EMPTY(&ch->children)); @@ -652,6 +634,9 @@ d->vchancount = 0; d->inprog = 0; + SLIST_INIT(&d->channels); + SLIST_INIT(&d->channels); + if (((numplay == 0) || (numrec == 0)) && (numplay != numrec)) d->flags |= SD_F_SIMPLEX; @@ -725,10 +710,87 @@ fkchan_kill(d->fakechan); sndstat_unregister(dev); + snd_mtxunlock(d->lock); snd_mtxfree(d->lock); return 0; } +int +pcm_regdevt(dev_t dev, unsigned unit, unsigned type, unsigned channel) +{ + struct snddev_info *d; + struct snddev_devt *dt; + + d = devclass_get_softc(pcm_devclass, unit); + KASSERT((d != NULL), ("bad d")); + KASSERT((dev != NULL), ("bad dev")); + + dt = malloc(sizeof(*dt), M_DEVBUF, M_ZERO | M_WAITOK); + if (dt == NULL) + return ENOMEM; + dt->dev = dev; + dt->type = type; + dt->channel = channel; + + snd_mtxlock(d->lock); + SLIST_INSERT_HEAD(&d->devs, dt, link); + snd_mtxunlock(d->lock); + + return 0; +} + +dev_t +pcm_getdevt(unsigned unit, unsigned type, unsigned channel) +{ + struct snddev_info *d; + struct snddev_devt *dt; + + d = devclass_get_softc(pcm_devclass, unit); + KASSERT((d != NULL), ("bad d")); + +#if 0 + snd_mtxlock(d->lock); +#endif + SLIST_FOREACH(dt, &d->devs, link) { + if ((dt->type == type) && (dt->channel == channel)) + return dt->dev; + } +#if 0 + snd_mtxunlock(d->lock); +#endif + + return NULL; +} + +int +pcm_unregdevt(unsigned unit, unsigned type, unsigned channel) +{ + struct snddev_info *d; + struct snddev_devt *dt; + + d = devclass_get_softc(pcm_devclass, unit); + KASSERT((d != NULL), ("bad d")); + +#if 0 + snd_mtxlock(d->lock); +#endif + SLIST_FOREACH(dt, &d->devs, link) { + if ((dt->type == type) && (dt->channel == channel)) { + SLIST_REMOVE(&d->devs, dt, snddev_devt, link); + free(dt, M_DEVBUF); +#if 0 + snd_mtxunlock(d->lock); +#endif + return 0; + } + } +#if 0 + snd_mtxunlock(d->lock); +#endif + + return ENOENT; +} + /************************************************************************/ static int @@ -778,7 +840,7 @@ c = sce->channel; sbuf_printf(s, "\n\t"); - /* it would be bettet to indent child channels */ + /* it would be better to indent child channels */ sbuf_printf(s, "%s[%s]: ", c->parentchannel? c->parentchannel->name : "", c->name); sbuf_printf(s, "spd %d", c->speed); if (c->speed != sndbuf_getspd(c->bufhard)) ==== //depot/projects/netperf/sys/dev/sound/pcm/sound.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.52 2003/09/07 16:28:03 cg Exp $ + * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.53 2004/01/17 10:37:11 phk Exp $ */ /* @@ -234,6 +234,10 @@ void pcm_setflags(device_t dev, u_int32_t val); void *pcm_getdevinfo(device_t dev); +int pcm_regdevt(dev_t dev, unsigned unit, unsigned type, unsigned channel); +dev_t pcm_getdevt(unsigned unit, unsigned type, unsigned channel); +int pcm_unregdevt(unsigned unit, unsigned type, unsigned channel); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 18 10:04:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE81416A4D0; Sun, 18 Jan 2004 10:04:09 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AFCC216A4CE for ; Sun, 18 Jan 2004 10:04:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F46943D2F for ; Sun, 18 Jan 2004 10:04:06 -0800 (PST) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0II460B028084 for ; Sun, 18 Jan 2004 10:04:06 -0800 (PST) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0II455u028081 for perforce@freebsd.org; Sun, 18 Jan 2004 10:04:05 -0800 (PST) (envelope-from scottl@freebsd.org) Date: Sun, 18 Jan 2004 10:04:05 -0800 (PST) Message-Id: <200401181804.i0II455u028081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 45545 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jan 2004 18:04:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=45545 Change 45545 by scottl@scottl-netperf on 2004/01/18 10:03:46 IFC @45542 Affected files ... .. //depot/projects/netperf+sockets/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/netperf+sockets/sys/boot/forth/frames.4th#2 integrate .. //depot/projects/netperf+sockets/sys/boot/pc98/libpc98/vidconsole.c#2 integrate .. //depot/projects/netperf+sockets/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/gx/if_gx.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ips/ips.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/mly/mly.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sio/sio.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pci/neomagic-coeff.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/umass.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs.h#9 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs_data.h#9 integrate .. //depot/projects/netperf+sockets/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#11 integrate .. //depot/projects/netperf+sockets/sys/rpc/rpcclnt.c#4 integrate .. //depot/projects/netperf+sockets/sys/vm/uma_int.h#3 integrate .. //depot/projects/netperf+sockets/sys/vm/vm_object.c#6 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/amd64/include/md_var.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.69 2003/11/17 08:58:14 peter Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.70 2004/01/17 13:13:48 phk Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -47,7 +47,6 @@ extern u_int cpu_id; extern u_int cpu_procinfo; extern char cpu_vendor[]; -extern uint16_t *elan_mmcr; extern char kstack[]; extern char sigcode[]; extern int szsigcode; ==== //depot/projects/netperf+sockets/sys/boot/forth/frames.4th#2 (text+ko) ==== @@ -1,6 +1,6 @@ \ Words implementing frame drawing \ XXX Filled boxes are left as an exercise for the reader... ;-/ -\ $FreeBSD: src/sys/boot/forth/frames.4th,v 1.1 2003/05/30 09:29:23 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/frames.4th,v 1.2 2004/01/18 04:13:27 nyan Exp $ marker task-frames.4th @@ -12,27 +12,49 @@ variable rb_el variable fill -\ Single frames -196 constant sh_el -179 constant sv_el -218 constant slt_el -192 constant slb_el -191 constant srt_el -217 constant srb_el -\ Double frames -205 constant dh_el -186 constant dv_el -201 constant dlt_el -200 constant dlb_el -187 constant drt_el -188 constant drb_el -\ Fillings -0 constant fill_none -32 constant fill_blank -176 constant fill_dark -177 constant fill_med -178 constant fill_bright - +s" arch-pc98" environment? [if] + \ Single frames + 149 constant sh_el + 150 constant sv_el + 152 constant slt_el + 154 constant slb_el + 153 constant srt_el + 155 constant srb_el + \ Double frames + 149 constant dh_el + 150 constant dv_el + 152 constant dlt_el + 154 constant dlb_el + 153 constant drt_el + 155 constant drb_el + \ Fillings + 0 constant fill_none + 32 constant fill_blank + 135 constant fill_dark + 135 constant fill_med + 135 constant fill_bright +[else] + \ Single frames + 196 constant sh_el + 179 constant sv_el + 218 constant slt_el + 192 constant slb_el + 191 constant srt_el + 217 constant srb_el + \ Double frames + 205 constant dh_el + 186 constant dv_el + 201 constant dlt_el + 200 constant dlb_el + 187 constant drt_el + 188 constant drb_el + \ Fillings + 0 constant fill_none + 32 constant fill_blank + 176 constant fill_dark + 177 constant fill_med + 178 constant fill_bright +[then] : hline ( len x y -- ) \ Draw horizontal single line at-xy \ move cursor ==== //depot/projects/netperf+sockets/sys/boot/pc98/libpc98/vidconsole.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/vidconsole.c,v 1.11 2003/09/08 09:11:20 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/vidconsole.c,v 1.12 2004/01/18 04:10:45 nyan Exp $"); #include #include @@ -422,7 +422,7 @@ { #ifdef PC98 - *crtat = (c == 0x5c ? 0xfc : c); + *crtat = (c == 0x5c ? 0xfc : (c & 0xff)); *(crtat + 0x1000) = at2pc98(fgcol, bgcol); #else v86.ctl = 0; ==== //depot/projects/netperf+sockets/sys/cam/scsi/scsi_sa.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.97 2003/09/13 02:01:56 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.98 2004/01/18 00:17:14 johan Exp $"); #include #include @@ -2403,7 +2403,7 @@ * Grotesque as it seems, the few times * I've actually seen a non-zero resid, * the tape drive actually lied and had - * writtent all the data!. + * written all the data!. */ csio->resid = 0; } ==== //depot/projects/netperf+sockets/sys/dev/ata/ata-chipset.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.56 2004/01/14 21:26:34 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.57 2004/01/17 23:34:13 sos Exp $"); #include "opt_ata.h" #include @@ -1585,7 +1585,8 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_SII3112, 0x02, SIIMEMIO, 0, ATA_SA150, "SiI 3112" }, + {{ ATA_SII3114, 0x00, SIIMEMIO, SII4CH, ATA_SA150, "SiI 3114" }, + { ATA_SII3112, 0x02, SIIMEMIO, 0, ATA_SA150, "SiI 3112" }, { ATA_SII3112_1, 0x02, SIIMEMIO, 0, ATA_SA150, "SiI 3112" }, { ATA_SII3112, 0x00, SIIMEMIO, SIIBUG, ATA_SA150, "SiI 3112" }, { ATA_SII3112_1, 0x00, SIIMEMIO, SIIBUG, ATA_SA150, "SiI 3112" }, @@ -1640,10 +1641,14 @@ ctlr->chip->text); } + if (ctlr->chip->cfg2 & SII4CH) + ctlr->channels = 4; + /* enable interrupt as BIOS might not */ pci_write_config(dev, 0x8a, (pci_read_config(dev, 0x8a, 1) & 0x3f), 1); /* setup chipset defaults as BIOS might not */ +#if 0 pci_write_config(dev, 0xa2, 0x328a, 2); pci_write_config(dev, 0xa4, 0x328a328a, 4); pci_write_config(dev, 0xa8, 0x22082208, 4); @@ -1652,7 +1657,7 @@ pci_write_config(dev, 0xe4, 0x328a328a, 4); pci_write_config(dev, 0xe8, 0x22082208, 4); pci_write_config(dev, 0xec, 0x40094009, 4); - +#endif ctlr->allocate = ata_sii_mio_allocate; if (ctlr->chip->max_dma >= ATA_SA150) ctlr->setmode = ata_sata_setmode; @@ -1685,24 +1690,25 @@ ata_sii_mio_allocate(device_t dev, struct ata_channel *ch) { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); + int unit01 = (ch->unit & 1), unit10 = (ch->unit & 2); int i; for (i = ATA_DATA; i <= ATA_STATUS; i++) { ch->r_io[i].res = ctlr->r_io2; - ch->r_io[i].offset = 0x80 + i + (ch->unit << 6); + ch->r_io[i].offset = 0x80 + i + (unit01 << 6) + (unit10 << 9); } ch->r_io[ATA_ALTSTAT].res = ctlr->r_io2; - ch->r_io[ATA_ALTSTAT].offset = 0x8a + (ch->unit << 6); + ch->r_io[ATA_ALTSTAT].offset = 0x8a + (unit01 << 6) + (unit10 << 9); ch->r_io[ATA_BMCMD_PORT].res = ctlr->r_io2; - ch->r_io[ATA_BMCMD_PORT].offset = 0x00 + (ch->unit << 3); + ch->r_io[ATA_BMCMD_PORT].offset = 0x00 + (unit01 << 3) + (unit10 << 9); ch->r_io[ATA_BMSTAT_PORT].res = ctlr->r_io2; - ch->r_io[ATA_BMSTAT_PORT].offset = 0x02 + (ch->unit << 3); + ch->r_io[ATA_BMSTAT_PORT].offset = 0x02 + (unit01 << 3) + (unit10 << 9); ch->r_io[ATA_BMDTP_PORT].res = ctlr->r_io2; - ch->r_io[ATA_BMDTP_PORT].offset = 0x04 + (ch->unit << 3); + ch->r_io[ATA_BMDTP_PORT].offset = 0x04 + (unit01 << 3) + (unit10 << 9); ch->r_io[ATA_BMDEVSPEC_0].res = ctlr->r_io2; - ch->r_io[ATA_BMDEVSPEC_0].offset = 0xa1 + (ch->unit << 6); + ch->r_io[ATA_BMDEVSPEC_0].offset = 0xa1 + (unit01 << 6) + (unit10 << 9); ch->r_io[ATA_BMDEVSPEC_1].res = ctlr->r_io2; - ch->r_io[ATA_BMDEVSPEC_1].offset = 0x100 + (ch->unit << 7); + ch->r_io[ATA_BMDEVSPEC_1].offset = 0x100 + (unit01 << 7) + (unit10 << 9); ch->r_io[ATA_IDX_ADDR].res = ctlr->r_io2; if (ctlr->chip->max_dma >= ATA_SA150) ==== //depot/projects/netperf+sockets/sys/dev/ata/ata-pci.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.20 2003/12/18 08:07:05 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.21 2004/01/17 23:34:13 sos Exp $ */ /* structure holding chipset config info */ @@ -158,9 +158,10 @@ #define ATA_CSB6_1 0x02171166 #define ATA_SILICON_IMAGE_ID 0x1095 -#define ATA_SII0680 0x06801095 +#define ATA_SII3114 0x31141095 #define ATA_SII3112 0x31121095 #define ATA_SII3112_1 0x02401095 +#define ATA_SII0680 0x06801095 #define ATA_CMD646 0x06461095 #define ATA_CMD648 0x06481095 #define ATA_CMD649 0x06491095 @@ -257,6 +258,7 @@ #define SIIINTR 0x01 #define SIISETCLK 0x02 #define SIIBUG 0x04 +#define SII4CH 0x08 #define SIS_SOUTH 1 #define SISSATA 2 ==== //depot/projects/netperf+sockets/sys/dev/ata/ata-raid.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.75 2004/01/14 21:26:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.77 2004/01/18 15:58:30 sos Exp $"); #include "opt_ata.h" #include @@ -1308,9 +1308,11 @@ sizeof(struct highpoint_raid_conf), (caddr_t)config, AR_WRITE)) { printf("ar%d: Highpoint write conf failed\n", rdp->lun); + free(config, M_AR); return -1; } } + free(config, M_AR); } return 0; } @@ -1603,9 +1605,11 @@ (caddr_t)config, AR_WRITE)) { printf("ar%d: %s write conf failed\n", rdp->lun, local ? "FreeBSD" : "Promise"); + free(config, M_AR); return -1; } } + free(config, M_AR); } return 0; } ==== //depot/projects/netperf+sockets/sys/dev/ata/atapi-cam.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.31 2004/01/14 21:26:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.32 2004/01/18 17:21:15 ru Exp $"); #include #include @@ -683,8 +683,10 @@ union ccb *ccb = malloc(sizeof(union ccb), M_ATACAM, M_WAITOK | M_ZERO); if (xpt_create_path(&path, xpt_periph, cam_sim_path(sim), - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) + CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { + free(ccb, M_ATACAM); return; + } CAM_DEBUG(ccb->ccb_h.path, CAM_DEBUG_TRACE, ("Rescanning ATAPI bus.\n")); xpt_setup_ccb(&ccb->ccb_h, path, 5/*priority (low)*/); ==== //depot/projects/netperf+sockets/sys/dev/ciss/ciss.c#4 (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/ciss/ciss.c,v 1.33 2003/12/13 07:54:07 ps Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.34 2004/01/18 16:55:01 ru Exp $ */ /* @@ -2167,6 +2167,7 @@ if (xpt_create_path(&sc->ciss_cam_path, xpt_periph, cam_sim_path(sc->ciss_cam_sim), target, 0) != CAM_REQ_CMP) { ciss_printf(sc, "rescan failed (can't create path)\n"); + free(ccb, M_TEMP); return; } ==== //depot/projects/netperf+sockets/sys/dev/gx/if_gx.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gx/if_gx.c,v 1.13 2003/10/31 18:32:01 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gx/if_gx.c,v 1.14 2004/01/18 10:15:48 yar Exp $"); #include #include @@ -350,13 +350,13 @@ ifp->if_init = gx_init; ifp->if_mtu = ETHERMTU; ifp->if_snd.ifq_maxlen = GX_TX_RING_CNT - 1; - ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING; + ifp->if_capabilities = IFCAP_VLAN_HWTAGGING; /* see if we can enable hardware checksumming */ - if (gx->gx_vflags & GXF_CSUM) { - ifp->if_capabilities = IFCAP_HWCSUM; - ifp->if_capenable = ifp->if_capabilities; - } + if (gx->gx_vflags & GXF_CSUM) + ifp->if_capabilities |= IFCAP_HWCSUM; + + ifp->if_capenable = ifp->if_capabilities; /* figure out transciever type */ if (gx->gx_vflags & GXF_FORCE_TBI || ==== //depot/projects/netperf+sockets/sys/dev/ips/ips.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ips/ips.c,v 1.6 2003/11/27 08:37:36 mbr Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ips/ips.c,v 1.7 2004/01/18 17:34:11 ru Exp $"); #include #include @@ -169,6 +169,7 @@ mask = splbio(); if(sc->state & IPS_OFFLINE){ splx(mask); + free(waiter, M_DEVBUF); return EIO; } command = SLIST_FIRST(&sc->free_cmd_list); ==== //depot/projects/netperf+sockets/sys/dev/mii/ukphy.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.14 2003/08/24 17:54:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.15 2004/01/17 10:44:39 phk Exp $"); /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. @@ -74,7 +74,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.14 2003/08/24 17:54:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.15 2004/01/17 10:44:39 phk Exp $"); #include #include @@ -167,6 +167,7 @@ printf("\n"); MIIBUS_MEDIAINIT(sc->mii_dev); + mii_phy_setmedia(sc); return(0); } ==== //depot/projects/netperf+sockets/sys/dev/mly/mly.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mly/mly.c,v 1.31 2003/09/02 17:30:36 jhb Exp $ + * $FreeBSD: src/sys/dev/mly/mly.c,v 1.32 2004/01/18 12:49:36 ru Exp $ */ #include @@ -2031,6 +2031,7 @@ if (xpt_create_path(&sc->mly_cam_path, xpt_periph, cam_sim_path(sc->mly_cam_sim[bus]), target, 0) != CAM_REQ_CMP) { mly_printf(sc, "rescan failed (can't create path)\n"); + free(ccb, M_TEMP); return; } xpt_setup_ccb(&ccb->ccb_h, sc->mly_cam_path, 5/*priority (low)*/); ==== //depot/projects/netperf+sockets/sys/dev/pci/pci_pci.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.29 2004/01/11 06:52:31 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.30 2004/01/17 21:54:04 imp Exp $"); /* * PCI:PCI bridge support. @@ -321,11 +321,12 @@ } } else { ok = 1; +#if 0 if (start < sc->iobase && end > sc->iolimit) { start = sc->iobase; end = sc->iolimit; } - +#endif } if (end < start) { device_printf(dev, "ioport: end (%lx) < start (%lx)\n", end, start); @@ -376,6 +377,7 @@ } } else if (!ok) { ok = 1; /* subtractive bridge: always ok */ +#if 0 if (pcib_is_nonprefetch_open(sc)) { if (start < sc->membase && end > sc->memlimit) { start = sc->membase; @@ -388,6 +390,7 @@ end = sc->pmemlimit; } } +#endif } if (end < start) { device_printf(dev, "memory: end (%lx) < start (%lx)\n", end, start); ==== //depot/projects/netperf+sockets/sys/dev/ppbus/vpo.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/vpo.c,v 1.29 2003/08/24 17:54:16 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/vpo.c,v 1.31 2004/01/18 13:09:38 ru Exp $"); #include #include @@ -191,6 +191,7 @@ if (xpt_create_path(&path, xpt_periph, cam_sim_path(vpo->sim), 0, 0) != CAM_REQ_CMP) { /* A failure is benign as the user can do a manual rescan */ + free(ccb, M_TEMP); return; } ==== //depot/projects/netperf+sockets/sys/dev/sio/sio.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.417 2003/12/24 04:11:10 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.418 2004/01/18 12:26:33 ru Exp $"); #include "opt_comconsole.h" #include "opt_compat.h" @@ -508,8 +508,10 @@ return (ENXIO); com = malloc(sizeof(*com), M_DEVBUF, M_NOWAIT | M_ZERO); - if (com == NULL) + if (com == NULL) { + bus_release_resource(dev, SYS_RES_IOPORT, rid, port); return (ENOMEM); + } device_set_softc(dev, com); com->bst = rman_get_bustag(port); com->bsh = rman_get_bushandle(port); ==== //depot/projects/netperf+sockets/sys/dev/sound/pci/neomagic-coeff.h#2 (text+ko) ==== @@ -25,12 +25,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/neomagic-coeff.h,v 1.2 2003/09/07 16:28:03 cg Exp $ + * $FreeBSD: src/sys/dev/sound/pci/neomagic-coeff.h,v 1.3 2004/01/17 10:37:10 phk Exp $ */ #define NM_TOTAL_COEFF_COUNT 0x3158 -static char coefficients[NM_TOTAL_COEFF_COUNT * 4] = { +static u_char coefficients[NM_TOTAL_COEFF_COUNT * 4] = { 0xFF, 0xFF, 0x2F, 0x00, 0x4B, 0xFF, 0xA5, 0x01, 0xEF, 0xFC, 0x21, 0x05, 0x87, 0xF7, 0x62, 0x11, 0xE9, 0x45, 0x5E, 0xF9, 0xB5, 0x01, 0xDE, 0xFF, 0xA4, 0xFF, 0x60, 0x00, 0xCA, 0xFF, 0x0D, 0x00, 0xFD, ==== //depot/projects/netperf+sockets/sys/dev/sound/pcm/dsp.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.67 2003/11/11 05:38:28 scottl Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.68 2004/01/17 10:37:11 phk Exp $"); #define OLDPCM_IOCTL @@ -455,15 +455,11 @@ * on dsp devices. */ - if (IOCGROUP(cmd) == 'M') { - dev_t pdev; - - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(PCMUNIT(i_dev), SND_DEV_CTL, 0)); - return mixer_ioctl(pdev, cmd, arg, mode, td); - } + d = dsp_get_info(i_dev); + if (IOCGROUP(cmd) == 'M') + return mixer_ioctl(d->mixer_dev, cmd, arg, mode, td); s = spltty(); - d = dsp_get_info(i_dev); getchns(i_dev, &rdch, &wrch, 0); kill = 0; @@ -580,7 +576,7 @@ (wrch? chn_getformats(wrch) : 0xffffffff); if (rdch && wrch) p->formats |= (dsp_get_flags(i_dev) & SD_F_SIMPLEX)? 0 : AFMT_FULLDUPLEX; - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(PCMUNIT(i_dev), SND_DEV_CTL, 0)); + pdev = d->mixer_dev; p->mixers = 1; /* default: one mixer */ p->inputs = pdev->si_drv1? mix_getdevs(pdev->si_drv1) : 0; p->left = p->right = 100; @@ -1051,12 +1047,26 @@ int dsp_register(int unit, int channel) { - make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_DSP, channel), + dev_t dt; + int r; + + dt = make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_DSP, channel), UID_ROOT, GID_WHEEL, 0666, "dsp%d.%d", unit, channel); - make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_DSP16, channel), + r = pcm_regdevt(dt, unit, SND_DEV_DSP, channel); + if (r) + return r; + + dt = make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_DSP16, channel), UID_ROOT, GID_WHEEL, 0666, "dspW%d.%d", unit, channel); - make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_AUDIO, channel), + r = pcm_regdevt(dt, unit, SND_DEV_DSP16, channel); + if (r) + return r; + + dt = make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_AUDIO, channel), UID_ROOT, GID_WHEEL, 0666, "audio%d.%d", unit, channel); + r = pcm_regdevt(dt, unit, SND_DEV_AUDIO, channel); + if (r) + return r; return 0; } @@ -1064,23 +1074,46 @@ int dsp_registerrec(int unit, int channel) { - make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_DSPREC, channel), + dev_t dt; + int r; + + dt = make_dev(&dsp_cdevsw, PCMMKMINOR(unit, SND_DEV_DSPREC, channel), UID_ROOT, GID_WHEEL, 0666, "dspr%d.%d", unit, channel); - return 0; + r = pcm_regdevt(dt, unit, SND_DEV_DSPREC, channel); + + return r; } int dsp_unregister(int unit, int channel) { dev_t pdev; + int r; - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(unit, SND_DEV_DSP, channel)); + pdev = pcm_getdevt(unit, SND_DEV_DSP, channel); + if (pdev == NULL) + return ENOENT; destroy_dev(pdev); - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(unit, SND_DEV_DSP16, channel)); + r = pcm_unregdevt(unit, SND_DEV_DSP, channel); + if (r) + return r; + + pdev = pcm_getdevt(unit, SND_DEV_DSP16, channel); + if (pdev == NULL) + return ENOENT; destroy_dev(pdev); - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(unit, SND_DEV_AUDIO, channel)); + r = pcm_unregdevt(unit, SND_DEV_DSP16, channel); + if (r) + return r; + + pdev = pcm_getdevt(unit, SND_DEV_AUDIO, channel); + if (pdev == NULL) + return ENOENT; destroy_dev(pdev); + r = pcm_unregdevt(unit, SND_DEV_AUDIO, channel); + if (r) + return r; return 0; } @@ -1089,11 +1122,15 @@ dsp_unregisterrec(int unit, int channel) { dev_t pdev; + int r; - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(unit, SND_DEV_DSPREC, channel)); + pdev = pcm_getdevt(unit, SND_DEV_DSPREC, channel); + if (pdev == NULL) + return ENOENT; destroy_dev(pdev); + r = pcm_unregdevt(unit, SND_DEV_DSPREC, channel); - return 0; + return r; } #ifdef USING_DEVFS @@ -1126,7 +1163,7 @@ cont = 1; for (i = 0; cont; i++) { - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(unit, devtype, i)); + pdev = pcm_getdevt(unit, devtype, i); if (pdev->si_flags & SI_NAMED) { if ((pdev->si_drv1 == NULL) && (pdev->si_drv2 == NULL)) { *dev = pdev; ==== //depot/projects/netperf+sockets/sys/dev/sound/pcm/mixer.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.33 2003/11/11 05:38:28 scottl Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.34 2004/01/17 10:37:11 phk Exp $"); MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); @@ -87,13 +87,11 @@ static dev_t mixer_get_devt(device_t dev) { - dev_t pdev; - int unit; + struct snddev_info *snddev; - unit = device_get_unit(dev); - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(unit, SND_DEV_CTL, 0)); + snddev = device_get_softc(dev); - return pdev; + return snddev->mixer_dev; } #ifdef SND_DYNSYSCTL @@ -187,6 +185,7 @@ int mixer_init(device_t dev, kobj_class_t cls, void *devinfo) { + struct snddev_info *snddev; struct snd_mixer *m; u_int16_t v; dev_t pdev; @@ -213,6 +212,8 @@ pdev = make_dev(&mixer_cdevsw, PCMMKMINOR(unit, SND_DEV_CTL, 0), UID_ROOT, GID_WHEEL, 0666, "mixer%d", unit); pdev->si_drv1 = m; + snddev = device_get_softc(dev); + snddev->mixer_dev = pdev; return 0; @@ -478,14 +479,14 @@ static void mixer_clone(void *arg, char *name, int namelen, dev_t *dev) { - dev_t pdev; + struct snddev_info *sd; if (*dev != NODEV) return; if (strcmp(name, "mixer") == 0) { - pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(snd_unit, SND_DEV_CTL, 0)); - if (pdev->si_flags & SI_NAMED) - *dev = pdev; + sd = devclass_get_softc(pcm_devclass, snd_unit); + if (sd != NULL) + *dev = sd->mixer_dev; } } ==== //depot/projects/netperf+sockets/sys/dev/sound/pcm/sound.c#3 (text+ko) ==== @@ -31,30 +31,8 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.86 2003/12/08 01:08:03 truckman Exp $"); - -#ifndef PCM_DEBUG_MTX -struct snddev_channel { - SLIST_ENTRY(snddev_channel) link; - struct pcm_channel *channel; -}; +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.87 2004/01/17 10:37:11 phk Exp $"); -struct snddev_info { - SLIST_HEAD(, snddev_channel) channels; - struct pcm_channel *fakechan; - unsigned devcount, playcount, reccount, vchancount; - unsigned flags; - int inprog; - unsigned int bufsz; - void *devinfo; - device_t dev; - char status[SND_STATUSLEN]; - struct sysctl_ctx_list sysctl_tree; - struct sysctl_oid *sysctl_tree_top; - struct mtx *lock; -}; -#endif - devclass_t pcm_devclass; int pcm_veto_load = 1; @@ -475,6 +453,7 @@ { struct snddev_channel *sce; int unit = device_get_unit(d->dev); +#if 0 int ourlock; ourlock = 0; @@ -482,13 +461,16 @@ snd_mtxlock(d->lock); ourlock = 1; } +#endif SLIST_FOREACH(sce, &d->channels, link) { if (sce->channel == ch) goto gotit; } +#if 0 if (ourlock) snd_mtxunlock(d->lock); +#endif return EINVAL; gotit: SLIST_REMOVE(&d->channels, sce, snddev_channel, link); @@ -505,8 +487,10 @@ else d->playcount--; +#if 0 if (ourlock) snd_mtxunlock(d->lock); +#endif free(sce, M_DEVBUF); return 0; @@ -554,9 +538,7 @@ struct pcm_channel *ch; int error = 0; - snd_mtxlock(d->lock); sce = SLIST_FIRST(&d->channels); - snd_mtxunlock(d->lock); ch = sce->channel; error = pcm_chn_remove(d, sce->channel, SLIST_EMPTY(&ch->children)); @@ -652,6 +634,9 @@ d->vchancount = 0; d->inprog = 0; + SLIST_INIT(&d->channels); + SLIST_INIT(&d->channels); + if (((numplay == 0) || (numrec == 0)) && (numplay != numrec)) d->flags |= SD_F_SIMPLEX; @@ -725,10 +710,87 @@ fkchan_kill(d->fakechan); sndstat_unregister(dev); + snd_mtxunlock(d->lock); snd_mtxfree(d->lock); return 0; } +int +pcm_regdevt(dev_t dev, unsigned unit, unsigned type, unsigned channel) +{ + struct snddev_info *d; + struct snddev_devt *dt; + + d = devclass_get_softc(pcm_devclass, unit); + KASSERT((d != NULL), ("bad d")); + KASSERT((dev != NULL), ("bad dev")); + + dt = malloc(sizeof(*dt), M_DEVBUF, M_ZERO | M_WAITOK); + if (dt == NULL) + return ENOMEM; + dt->dev = dev; + dt->type = type; + dt->channel = channel; + + snd_mtxlock(d->lock); + SLIST_INSERT_HEAD(&d->devs, dt, link); + snd_mtxunlock(d->lock); + + return 0; +} + +dev_t +pcm_getdevt(unsigned unit, unsigned type, unsigned channel) +{ + struct snddev_info *d; + struct snddev_devt *dt; + + d = devclass_get_softc(pcm_devclass, unit); + KASSERT((d != NULL), ("bad d")); + +#if 0 + snd_mtxlock(d->lock); +#endif + SLIST_FOREACH(dt, &d->devs, link) { + if ((dt->type == type) && (dt->channel == channel)) + return dt->dev; + } +#if 0 + snd_mtxunlock(d->lock); +#endif + + return NULL; +} + +int +pcm_unregdevt(unsigned unit, unsigned type, unsigned channel) +{ + struct snddev_info *d; + struct snddev_devt *dt; + + d = devclass_get_softc(pcm_devclass, unit); + KASSERT((d != NULL), ("bad d")); + +#if 0 + snd_mtxlock(d->lock); +#endif + SLIST_FOREACH(dt, &d->devs, link) { + if ((dt->type == type) && (dt->channel == channel)) { + SLIST_REMOVE(&d->devs, dt, snddev_devt, link); + free(dt, M_DEVBUF); +#if 0 + snd_mtxunlock(d->lock); +#endif + return 0; + } + } +#if 0 + snd_mtxunlock(d->lock); +#endif + + return ENOENT; +} + /************************************************************************/ static int @@ -778,7 +840,7 @@ c = sce->channel; sbuf_printf(s, "\n\t"); - /* it would be bettet to indent child channels */ + /* it would be better to indent child channels */ sbuf_printf(s, "%s[%s]: ", c->parentchannel? c->parentchannel->name : "", c->name); sbuf_printf(s, "spd %d", c->speed); if (c->speed != sndbuf_getspd(c->bufhard)) ==== //depot/projects/netperf+sockets/sys/dev/sound/pcm/sound.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.52 2003/09/07 16:28:03 cg Exp $ + * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.53 2004/01/17 10:37:11 phk Exp $ */ /* @@ -234,6 +234,10 @@ void pcm_setflags(device_t dev, u_int32_t val); void *pcm_getdevinfo(device_t dev); +int pcm_regdevt(dev_t dev, unsigned unit, unsigned type, unsigned channel); +dev_t pcm_getdevt(unsigned unit, unsigned type, unsigned channel); +int pcm_unregdevt(unsigned unit, unsigned type, unsigned channel); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 18 16:33:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BD9016A4D0; Sun, 18 Jan 2004 16:33:24 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 245CE16A4CE for ; Sun, 18 Jan 2004 16:33:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1A4A43D58 for ; Sun, 18 Jan 2004 16:32:36 -0800 (PST) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0J0Wa0B023066 for ; Sun, 18 Jan 2004 16:32:36 -0800 (PST) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0J0WanH023063 for perforce@freebsd.org; Sun, 18 Jan 2004 16:32:36 -0800 (PST) (envelope-from scottl@freebsd.org) Date: Sun, 18 Jan 2004 16:32:36 -0800 (PST) Message-Id: <200401190032.i0J0WanH023063@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 45562 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 00:33:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=45562 Change 45562 by scottl@scottl_netperf_socket on 2004/01/18 16:31:40 Merge over the socket locking and MT_TAG changes from sam_socket and sam_netperf so we have a base to work from. Affected files ... .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/sys_socket.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/netperf_socket/sys/net/bpf.c#2 integrate .. //depot/projects/netperf_socket/sys/net/bridge.c#2 integrate .. //depot/projects/netperf_socket/sys/net/raw_cb.c#2 integrate .. //depot/projects/netperf_socket/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/netperf_socket/sys/net/route.h#2 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/netperf_socket/sys/netatm/atm_socket.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/in_proto.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_output.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_var.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_pcb.c#2 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/netperf_socket/sys/netnatm/natm.c#2 integrate .. //depot/projects/netperf_socket/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/netperf_socket/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/krpc_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/netperf_socket/sys/rpc/rpcclnt.c#2 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/unpcb.h#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/kern/kern_descrip.c#2 (text+ko) ==== @@ -2032,7 +2032,7 @@ void fputsock(struct socket *so) { - + SOCK_LOCK(so); sorele(so); } ==== //depot/projects/netperf_socket/sys/kern/sys_socket.c#2 (text+ko) ==== @@ -77,19 +77,12 @@ int flags; { struct socket *so = fp->f_data; - int error; - - mtx_lock(&Giant); #ifdef MAC - error = mac_check_socket_receive(active_cred, so); - if (error) { - mtx_unlock(&Giant); + int error = mac_check_socket_receive(active_cred, so); + if (error) return (error); - } #endif - error = so->so_proto->pr_usrreqs->pru_soreceive(so, 0, uio, 0, 0, 0); - mtx_unlock(&Giant); - return (error); + return (so->so_proto->pr_usrreqs->pru_soreceive(so, 0, uio, 0, 0, 0)); } /* ARGSUSED */ @@ -102,20 +95,13 @@ int flags; { struct socket *so = fp->f_data; - int error; - - mtx_lock(&Giant); #ifdef MAC - error = mac_check_socket_send(active_cred, so); - if (error) { - mtx_unlock(&Giant); + int error = mac_check_socket_send(active_cred, so); + if (error) return (error); - } #endif - error = so->so_proto->pr_usrreqs->pru_sosend(so, 0, uio, 0, 0, 0, - uio->uio_td); - mtx_unlock(&Giant); - return (error); + return (so->so_proto->pr_usrreqs->pru_sosend(so, 0, uio, 0, 0, 0, + uio->uio_td)); } int ==== //depot/projects/netperf_socket/sys/kern/uipc_domain.c#2 (text+ko) ==== ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#2 (text+ko) ==== @@ -128,21 +128,14 @@ * soalloc() returns a socket with a ref count of 0. */ struct socket * -soalloc(waitok) - int waitok; +soalloc(int mflags) { struct socket *so; #ifdef MAC int error; #endif - int flag; - if (waitok == 1) - flag = M_WAITOK; - else - flag = M_NOWAIT; - flag |= M_ZERO; - so = uma_zalloc(socket_zone, flag); + so = uma_zalloc(socket_zone, mflags | M_ZERO); if (so) { #ifdef MAC error = mac_init_socket(so, flag); @@ -152,6 +145,8 @@ return so; } #endif + SOCKBUF_LOCK_INIT(&so->so_snd, "so_snd"); + SOCKBUF_LOCK_INIT(&so->so_rcv, "so_rcv"); /* XXX race condition for reentrant kernel */ so->so_gencnt = ++so_gencnt; /* sx_init(&so->so_sxlock, "socket sxlock"); */ @@ -195,7 +190,7 @@ if (prp->pr_type != type) return (EPROTOTYPE); - so = soalloc(1); + so = soalloc(M_WAITOK); if (so == NULL) return (ENOBUFS); @@ -210,6 +205,7 @@ soref(so); error = (*prp->pr_usrreqs->pru_attach)(so, proto, td); if (error) { + SOCK_LOCK(so); so->so_state |= SS_NOFDREF; sorele(so); return (error); @@ -253,6 +249,8 @@ mac_destroy_socket(so); #endif crfree(so->so_cred); + SOCKBUF_LOCK_DESTROY(&so->so_snd); + SOCKBUF_LOCK_DESTROY(&so->so_rcv); /* sx_destroy(&so->so_sxlock); */ uma_zfree(socket_zone, so); --numopensockets; @@ -277,11 +275,13 @@ splx(s); return (error); } + SOCKBUF_LOCK(&so->so_rcv); if (TAILQ_EMPTY(&so->so_comp)) so->so_options |= SO_ACCEPTCONN; if (backlog < 0 || backlog > somaxconn) backlog = somaxconn; so->so_qlimit = backlog; + SOCKBUF_UNLOCK(&so->so_rcv); splx(s); return (0); } @@ -290,13 +290,16 @@ sofree(so) struct socket *so; { - struct socket *head = so->so_head; - KASSERT(so->so_count == 0, ("socket %p so_count not 0", so)); - if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0) + if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0) { + SOCK_UNLOCK(so); return; - if (head != NULL) { + } + SOCK_UNLOCK(so); + SOCKBUF_LOCK(&so->so_rcv); + if (so->so_head != NULL) { + struct socket *head = so->so_head; if (so->so_state & SS_INCOMP) { TAILQ_REMOVE(&head->so_incomp, so, so_list); head->so_incqlen--; @@ -307,6 +310,7 @@ * accept(2) may hang after select(2) indicated * that the listening socket was ready. */ + /* XXX SOCKBUF_UNLOCK(&so->so_rcv); */ return; } else { panic("sofree: not queued"); @@ -314,7 +318,10 @@ so->so_state &= ~SS_INCOMP; so->so_head = NULL; } + SOCKBUF_UNLOCK(&so->so_rcv); + SOCKBUF_LOCK(&so->so_snd); sbrelease(&so->so_snd, so); + SOCKBUF_UNLOCK(&so->so_snd); sorflush(so); sodealloc(so); } @@ -354,11 +361,14 @@ (void) soabort(sp); } } + SOCK_LOCK(so); if (so->so_pcb == 0) goto discard; if (so->so_state & SS_ISCONNECTED) { if ((so->so_state & SS_ISDISCONNECTING) == 0) { + SOCK_UNLOCK(so); error = sodisconnect(so); + SOCK_LOCK(so); if (error) goto drop; } @@ -367,7 +377,7 @@ (so->so_state & SS_NBIO)) goto drop; while (so->so_state & SS_ISCONNECTED) { - error = tsleep(&so->so_timeo, + error = msleep(&so->so_timeo, SOCK_MTX(so), PSOCK | PCATCH, "soclos", so->so_linger * hz); if (error) break; @@ -376,7 +386,10 @@ } drop: if (so->so_pcb) { - int error2 = (*so->so_proto->pr_usrreqs->pru_detach)(so); + int error2; + SOCK_UNLOCK(so); + error2 = (*so->so_proto->pr_usrreqs->pru_detach)(so); + SOCK_LOCK(so); if (error == 0) error = error2; } @@ -400,6 +413,7 @@ error = (*so->so_proto->pr_usrreqs->pru_abort)(so); if (error) { + SOCK_LOCK(so); sotryfree(so); /* note: does not decrement the ref count */ return error; } @@ -411,14 +425,12 @@ struct socket *so; struct sockaddr **nam; { - int s = splnet(); int error; if ((so->so_state & SS_NOFDREF) == 0) panic("soaccept: !NOFDREF"); so->so_state &= ~SS_NOFDREF; error = (*so->so_proto->pr_usrreqs->pru_accept)(so, nam); - splx(s); return (error); } @@ -428,12 +440,10 @@ struct sockaddr *nam; struct thread *td; { - int s; int error; if (so->so_options & SO_ACCEPTCONN) return (EOPNOTSUPP); - s = splnet(); /* * If protocol is connection-based, can only connect once. * Otherwise, if connected, try to disconnect first. @@ -446,7 +456,6 @@ error = EISCONN; else error = (*so->so_proto->pr_usrreqs->pru_connect)(so, nam, td); - splx(s); return (error); } @@ -455,11 +464,9 @@ struct socket *so1; struct socket *so2; { - int s = splnet(); int error; error = (*so1->so_proto->pr_usrreqs->pru_connect2)(so1, so2); - splx(s); return (error); } @@ -467,20 +474,13 @@ sodisconnect(so) struct socket *so; { - int s = splnet(); int error; - if ((so->so_state & SS_ISCONNECTED) == 0) { - error = ENOTCONN; - goto bad; - } - if (so->so_state & SS_ISDISCONNECTING) { - error = EALREADY; - goto bad; - } + if ((so->so_state & SS_ISCONNECTED) == 0) + return ENOTCONN; + if (so->so_state & SS_ISDISCONNECTING) + return EALREADY; error = (*so->so_proto->pr_usrreqs->pru_disconnect)(so); -bad: - splx(s); return (error); } @@ -531,7 +531,7 @@ struct mbuf **mp; struct mbuf *m; long space, len, resid; - int clen = 0, error, s, dontroute, mlen; + int clen = 0, error, dontroute, mlen; int atomic = sosendallatonce(so) || top; #ifdef ZERO_COPY_SOCKETS int cow_send; @@ -563,20 +563,18 @@ td->td_proc->p_stats->p_ru.ru_msgsnd++; if (control) clen = control->m_len; -#define snderr(errno) { error = (errno); splx(s); goto release; } +#define snderr(errno) { error = (errno); goto release; } -restart: + SOCKBUF_LOCK(&so->so_snd); error = sblock(&so->so_snd, SBLOCKWAIT(flags)); if (error) goto out; do { - s = splnet(); if (so->so_state & SS_CANTSENDMORE) snderr(EPIPE); if (so->so_error) { error = so->so_error; so->so_error = 0; - splx(s); goto release; } if ((so->so_state & SS_ISCONNECTED) == 0) { @@ -605,14 +603,11 @@ (atomic || space < so->so_snd.sb_lowat || space < clen)) { if (so->so_state & SS_NBIO) snderr(EWOULDBLOCK); - sbunlock(&so->so_snd); error = sbwait(&so->so_snd); - splx(s); if (error) - goto out; - goto restart; + goto release; + continue; } - splx(s); mp = ⊤ space -= clen; do { @@ -627,10 +622,12 @@ #ifdef ZERO_COPY_SOCKETS cow_send = 0; #endif /* ZERO_COPY_SOCKETS */ + SOCKBUF_UNLOCK(&so->so_snd); if (top == 0) { MGETHDR(m, M_TRYWAIT, MT_DATA); if (m == NULL) { error = ENOBUFS; + SOCKBUF_LOCK(&so->so_snd); /* XXX */ goto release; } mlen = MHLEN; @@ -640,6 +637,7 @@ MGET(m, M_TRYWAIT, MT_DATA); if (m == NULL) { error = ENOBUFS; + SOCKBUF_LOCK(&so->so_snd); /* XXX */ goto release; } mlen = MLEN; @@ -687,6 +685,7 @@ else #endif /* ZERO_COPY_SOCKETS */ error = uiomove(mtod(m, void *), (int)len, uio); + SOCKBUF_LOCK(&so->so_snd); resid = uio->uio_resid; m->m_len = len; *mp = m; @@ -702,13 +701,12 @@ } while (space > 0 && atomic); if (dontroute) so->so_options |= SO_DONTROUTE; - s = splnet(); /* XXX */ /* * XXX all the SS_CANTSENDMORE checks previously * done could be out of date. We could have recieved * a reset packet in an interrupt or maybe we slept * while doing page faults in uiomove() etc. We could - * probably recheck again inside the splnet() protection + * probably recheck again inside the locking protection * here, but there are probably other places that this * also happens. We must rethink this. */ @@ -726,7 +724,6 @@ /* If there is more to send set PRUS_MORETOCOME */ (resid > 0 && space > 0) ? PRUS_MORETOCOME : 0, top, addr, control, td); - splx(s); if (dontroute) so->so_options &= ~SO_DONTROUTE; clen = 0; @@ -741,6 +738,7 @@ release: sbunlock(&so->so_snd); out: + SOCKBUF_UNLOCK(&so->so_snd); if (top) m_freem(top); if (control) @@ -774,7 +772,7 @@ int *flagsp; { struct mbuf *m, **mp; - int flags, len, error, s, offset; + int flags, len, error, offset; struct protosw *pr = so->so_proto; struct mbuf *nextrecord; int moff, type = 0; @@ -832,12 +830,12 @@ if (so->so_state & SS_ISCONFIRMING && uio->uio_resid) (*pr->pr_usrreqs->pru_rcvd)(so, 0); -restart: + SOCKBUF_LOCK(&so->so_rcv); error = sblock(&so->so_rcv, SBLOCKWAIT(flags)); if (error) - return (error); - s = splnet(); + goto out; +restart: m = so->so_rcv.sb_mb; /* * If we have less data than requested, block awaiting more @@ -855,9 +853,8 @@ (so->so_rcv.sb_cc < so->so_rcv.sb_lowat || ((flags & MSG_WAITALL) && uio->uio_resid <= so->so_rcv.sb_hiwat)) && m->m_nextpkt == 0 && (pr->pr_flags & PR_ATOMIC) == 0)) { - KASSERT(m != 0 || !so->so_rcv.sb_cc, - ("receive: m == %p so->so_rcv.sb_cc == %u", - m, so->so_rcv.sb_cc)); + KASSERT(!(m == 0 && so->so_rcv.sb_cc), + ("m %p so->so_rcv.sb_cc %u", m, so->so_rcv.sb_cc)); if (so->so_error) { if (m) goto dontblock; @@ -890,14 +887,13 @@ } SBLASTRECORDCHK(&so->so_rcv); SBLASTMBUFCHK(&so->so_rcv); - sbunlock(&so->so_rcv); error = sbwait(&so->so_rcv); - splx(s); if (error) - return (error); + goto release; goto restart; } dontblock: + KASSERT(error == 0, ("unexpected state, error %u", error)); if (uio->uio_td) uio->uio_td->td_proc->p_stats->p_ru.ru_msgrcv++; SBLASTRECORDCHK(&so->so_rcv); @@ -906,10 +902,14 @@ if (pr->pr_flags & PR_ADDR) { KASSERT(m->m_type == MT_SONAME, ("m->m_type == %d", m->m_type)); - orig_resid = 0; - if (psa) - *psa = dup_sockaddr(mtod(m, struct sockaddr *), - mp0 == 0); + if (psa) { + *psa = sodupsockaddr(mtod(m, struct sockaddr *), + M_NOWAIT); + if (*psa == NULL) { + error = ENOMEM; + goto release; + } + } if (flags & MSG_PEEK) { m = m->m_next; } else { @@ -917,30 +917,56 @@ so->so_rcv.sb_mb = m_free(m); m = so->so_rcv.sb_mb; } + orig_resid = 0; } - while (m && m->m_type == MT_CONTROL && error == 0) { - if (flags & MSG_PEEK) { - if (controlp) - *controlp = m_copy(m, 0, m->m_len); - m = m->m_next; - } else { - sbfree(&so->so_rcv, m); - so->so_rcv.sb_mb = m->m_next; - m->m_next = NULL; - if (pr->pr_domain->dom_externalize) - error = - (*pr->pr_domain->dom_externalize)(m, controlp); - else if (controlp) - *controlp = m; - else - m_freem(m); - m = so->so_rcv.sb_mb; + if (m && m->m_type == MT_CONTROL) { + struct mbuf *cm = NULL; + struct mbuf **cme = &cm; + + do { + if (flags & MSG_PEEK) { + if (controlp) { + SOCKBUF_UNLOCK(&so->so_rcv); + *controlp = m_copym(m, 0, m->m_len, + M_TRYWAIT); + SOCKBUF_LOCK(&so->so_rcv); + if (*controlp == NULL) { + error = ENOBUFS; + goto release; + } + controlp = &(*controlp)->m_next; + } + m = m->m_next; + } else { + sbfree(&so->so_rcv, m); + so->so_rcv.sb_mb = m->m_next; + m->m_next = NULL; + if (controlp) { + /* + * Collect mbufs for processing below. + */ + *cme = m; + cme = &(*cme)->m_next; + } else + m_free(m); + m = so->so_rcv.sb_mb; + } + } while (m && m->m_type == MT_CONTROL); + if (cm != NULL) { + if (pr->pr_domain->dom_externalize) { + /* + * NB: drop the lock to avoid potential LORs; + * in particular unix domain sockets grab the + * file descriptor lock which would be a LOR. + */ + SOCKBUF_UNLOCK(&so->so_rcv); + error = (*pr->pr_domain->dom_externalize) + (cm, controlp); + SOCKBUF_LOCK(&so->so_rcv); + } else + m_freem(cm); } - if (controlp) { - orig_resid = 0; - while (*controlp != NULL) - controlp = &(*controlp)->m_next; - } + orig_resid = 0; } if (m) { if ((flags & MSG_PEEK) == 0) { @@ -997,7 +1023,7 @@ if (mp == 0) { SBLASTRECORDCHK(&so->so_rcv); SBLASTMBUFCHK(&so->so_rcv); - splx(s); + SOCKBUF_UNLOCK(&so->so_rcv); #ifdef ZERO_COPY_SOCKETS if (so_zero_copy_receive) { vm_page_t pg; @@ -1021,7 +1047,7 @@ } else #endif /* ZERO_COPY_SOCKETS */ error = uiomove(mtod(m, char *) + moff, (int)len, uio); - s = splnet(); + SOCKBUF_LOCK(&so->so_rcv); if (error) goto release; } else @@ -1102,9 +1128,8 @@ SBLASTMBUFCHK(&so->so_rcv); error = sbwait(&so->so_rcv); if (error) { - sbunlock(&so->so_rcv); - splx(s); - return (0); + error = 0; + goto release; } m = so->so_rcv.sb_mb; if (m) @@ -1137,17 +1162,15 @@ (*pr->pr_usrreqs->pru_rcvd)(so, flags); } if (orig_resid == uio->uio_resid && orig_resid && - (flags & MSG_EOR) == 0 && (so->so_state & SS_CANTRCVMORE) == 0) { - sbunlock(&so->so_rcv); - splx(s); - goto restart; - } + (flags & MSG_EOR) == 0 && (so->so_state & SS_CANTRCVMORE) == 0) + goto restart; /* XXX multi-counts msgs */ if (flagsp) *flagsp |= flags; release: sbunlock(&so->so_rcv); - splx(s); +out: + SOCKBUF_UNLOCK(&so->so_rcv); return (error); } @@ -1174,22 +1197,21 @@ { struct sockbuf *sb = &so->so_rcv; struct protosw *pr = so->so_proto; - int s; struct sockbuf asb; + SOCKBUF_LOCK(sb); sb->sb_flags |= SB_NOINTR; (void) sblock(sb, M_WAITOK); - s = splimp(); - socantrcvmore(so); + socantrcvmore_locked(so); sbunlock(sb); asb = *sb; /* - * Invalidate/clear most of the sockbuf structure, but keep - * its selinfo structure valid. + * Invalidate/clear most of the sockbuf structure, but leave + * selinfo and mutex data unchanged. */ bzero(&sb->sb_startzero, sizeof(*sb) - offsetof(struct sockbuf, sb_startzero)); - splx(s); + SOCKBUF_UNLOCK(sb); if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose) (*pr->pr_domain->dom_dispose)(asb.sb_mb); @@ -1207,6 +1229,7 @@ struct so_accf *af = so->so_accf; int error = 0; +/* XXX locking */ /* do not set/remove accept filters on non listen sockets */ if ((so->so_options & SO_ACCEPTCONN) == 0) { error = EINVAL; @@ -1801,7 +1824,6 @@ { struct socket *so = kn->kn_fp->f_data; struct sockbuf *sb; - int s; switch (kn->kn_filter) { case EVFILT_READ: @@ -1819,10 +1841,10 @@ return (1); } - s = splnet(); + SOCKBUF_LOCK(sb); SLIST_INSERT_HEAD(&sb->sb_sel.si_note, kn, kn_selnext); sb->sb_flags |= SB_KNOTE; - splx(s); + SOCKBUF_UNLOCK(sb); return (0); } @@ -1830,12 +1852,12 @@ filt_sordetach(struct knote *kn) { struct socket *so = kn->kn_fp->f_data; - int s = splnet(); + SOCKBUF_LOCK(&so->so_rcv); SLIST_REMOVE(&so->so_rcv.sb_sel.si_note, kn, knote, kn_selnext); if (SLIST_EMPTY(&so->so_rcv.sb_sel.si_note)) so->so_rcv.sb_flags &= ~SB_KNOTE; - splx(s); + SOCKBUF_UNLOCK(&so->so_rcv); } /*ARGSUSED*/ @@ -1843,30 +1865,35 @@ filt_soread(struct knote *kn, long hint) { struct socket *so = kn->kn_fp->f_data; + int result; + SOCKBUF_LOCK(&so->so_rcv); /* XXX too conservative? */ kn->kn_data = so->so_rcv.sb_cc - so->so_rcv.sb_ctl; if (so->so_state & SS_CANTRCVMORE) { kn->kn_flags |= EV_EOF; kn->kn_fflags = so->so_error; - return (1); + result = 1; + } else if (so->so_error) { /* temporary udp error */ + result = 1; + } else if (kn->kn_sfflags & NOTE_LOWAT) { + result = (kn->kn_data >= kn->kn_sdata); + } else { + result = (so->so_rcv.sb_cc >= so->so_rcv.sb_lowat); } - if (so->so_error) /* temporary udp error */ - return (1); - if (kn->kn_sfflags & NOTE_LOWAT) - return (kn->kn_data >= kn->kn_sdata); - return (so->so_rcv.sb_cc >= so->so_rcv.sb_lowat); + SOCKBUF_UNLOCK(&so->so_rcv); + return (result); } static void filt_sowdetach(struct knote *kn) { struct socket *so = kn->kn_fp->f_data; - int s = splnet(); + SOCKBUF_LOCK(&so->so_snd); SLIST_REMOVE(&so->so_snd.sb_sel.si_note, kn, knote, kn_selnext); if (SLIST_EMPTY(&so->so_snd.sb_sel.si_note)) so->so_snd.sb_flags &= ~SB_KNOTE; - splx(s); + SOCKBUF_UNLOCK(&so->so_snd); } /*ARGSUSED*/ @@ -1874,21 +1901,26 @@ filt_sowrite(struct knote *kn, long hint) { struct socket *so = kn->kn_fp->f_data; + int result; + SOCKBUF_LOCK(&so->so_snd); /* XXX too conservative? */ kn->kn_data = sbspace(&so->so_snd); if (so->so_state & SS_CANTSENDMORE) { kn->kn_flags |= EV_EOF; kn->kn_fflags = so->so_error; - return (1); + result = 1; + } else if (so->so_error) { /* temporary udp error */ + result = 1; + } else if (((so->so_state & SS_ISCONNECTED) == 0) && + (so->so_proto->pr_flags & PR_CONNREQUIRED)) { + result = 0; + } else if (kn->kn_sfflags & NOTE_LOWAT) { + result = (kn->kn_data >= kn->kn_sdata); + } else { + result = (kn->kn_data >= so->so_snd.sb_lowat); } - if (so->so_error) /* temporary udp error */ - return (1); - if (((so->so_state & SS_ISCONNECTED) == 0) && - (so->so_proto->pr_flags & PR_CONNREQUIRED)) - return (0); - if (kn->kn_sfflags & NOTE_LOWAT) - return (kn->kn_data >= kn->kn_sdata); - return (kn->kn_data >= so->so_snd.sb_lowat); + SOCKBUF_UNLOCK(&so->so_snd); + return (result); } /*ARGSUSED*/ ==== //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#2 (text+ko) ==== @@ -108,9 +108,14 @@ soisconnecting(so) register struct socket *so; { + int need_lock = !SOCK_OWNED(so); + if (need_lock) + SOCK_LOCK(so); so->so_state &= ~(SS_ISCONNECTED|SS_ISDISCONNECTING); so->so_state |= SS_ISCONNECTING; + if (need_lock) + SOCK_UNLOCK(so); } void @@ -118,56 +123,79 @@ struct socket *so; { struct socket *head = so->so_head; + int need_lock = !SOCK_OWNED(so); + if (need_lock) + SOCK_LOCK(so); so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING); so->so_state |= SS_ISCONNECTED; if (head && (so->so_state & SS_INCOMP)) { - if ((so->so_options & SO_ACCEPTFILTER) != 0) { + if ((so->so_options & SO_ACCEPTFILTER) == 0) { + if (need_lock) + SOCK_UNLOCK(so); + SOCK_LOCK(head); + TAILQ_REMOVE(&head->so_incomp, so, so_list); + head->so_incqlen--; + so->so_state &= ~SS_INCOMP; + TAILQ_INSERT_TAIL(&head->so_comp, so, so_list); + head->so_qlen++; + so->so_state |= SS_COMP; + sorwakeup_locked(head); + wakeup_one(&head->so_timeo); + SOCK_UNLOCK(head); + } else { +/* XXX locking */ so->so_upcall = head->so_accf->so_accept_filter->accf_callback; so->so_upcallarg = head->so_accf->so_accept_filter_arg; so->so_rcv.sb_flags |= SB_UPCALL; so->so_options &= ~SO_ACCEPTFILTER; so->so_upcall(so, so->so_upcallarg, M_TRYWAIT); - return; } - TAILQ_REMOVE(&head->so_incomp, so, so_list); - head->so_incqlen--; - so->so_state &= ~SS_INCOMP; - TAILQ_INSERT_TAIL(&head->so_comp, so, so_list); - head->so_qlen++; - so->so_state |= SS_COMP; - sorwakeup(head); - wakeup_one(&head->so_timeo); } else { wakeup(&so->so_timeo); + SOCK_UNLOCK(so); sorwakeup(so); sowwakeup(so); } + if (!need_lock) + SOCK_LOCK(so); } void soisdisconnecting(so) register struct socket *so; { + int need_lock = !SOCK_OWNED(so); + if (need_lock) + SOCK_LOCK(so); so->so_state &= ~SS_ISCONNECTING; so->so_state |= (SS_ISDISCONNECTING|SS_CANTRCVMORE|SS_CANTSENDMORE); wakeup(&so->so_timeo); + SOCK_UNLOCK(so); sowwakeup(so); sorwakeup(so); + if (!need_lock) + SOCK_LOCK(so); } void soisdisconnected(so) register struct socket *so; { + int need_lock = !SOCK_OWNED(so); + if (need_lock) + SOCK_LOCK(so); so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING); so->so_state |= (SS_CANTRCVMORE|SS_CANTSENDMORE|SS_ISDISCONNECTED); wakeup(&so->so_timeo); + SOCK_UNLOCK(so); sbdrop(&so->so_snd, so->so_snd.sb_cc); sowwakeup(so); sorwakeup(so); + if (!need_lock) + SOCK_LOCK(so); } /* @@ -186,10 +214,14 @@ int connstatus; { register struct socket *so; + int over; - if (head->so_qlen > 3 * head->so_qlimit / 2) + SOCK_LOCK(head); + over = (head->so_qlen > 3 * head->so_qlimit / 2); + SOCK_UNLOCK(head); + if (over) return ((struct socket *)0); - so = soalloc(0); + so = soalloc(M_NOWAIT); if (so == NULL) return ((struct socket *)0); if ((head->so_options & SO_ACCEPTFILTER) != 0) @@ -205,12 +237,13 @@ #ifdef MAC mac_create_socket_from_socket(head, so); #endif + if (soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat) || (*so->so_proto->pr_usrreqs->pru_attach)(so, 0, NULL)) { sodealloc(so); return ((struct socket *)0); } - + SOCKBUF_LOCK(&head->so_rcv); if (connstatus) { TAILQ_INSERT_TAIL(&head->so_comp, so, so_list); so->so_state |= SS_COMP; @@ -225,10 +258,11 @@ so->so_state |= SS_INCOMP; head->so_incqlen++; } + SOCKBUF_UNLOCK(&head->so_rcv); if (connstatus) { + so->so_state |= connstatus; sorwakeup(head); wakeup(&head->so_timeo); - so->so_state |= connstatus; } return (so); } @@ -253,6 +287,16 @@ } void +socantsendmore_locked(so) + struct socket *so; +{ + SOCKBUF_LOCK_ASSERT(&so->so_snd); + + so->so_state |= SS_CANTSENDMORE; + sowwakeup(so); +} + +void socantrcvmore(so) struct socket *so; { @@ -261,6 +305,16 @@ sorwakeup(so); } +void >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 18 16:41:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA13D16A4D0; Sun, 18 Jan 2004 16:41:50 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B0ACE16A4CE for ; Sun, 18 Jan 2004 16:41:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A719A43D2F for ; Sun, 18 Jan 2004 16:41:49 -0800 (PST) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0J0fn0B024719 for ; Sun, 18 Jan 2004 16:41:49 -0800 (PST) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0J0fnDi024710 for perforce@freebsd.org; Sun, 18 Jan 2004 16:41:49 -0800 (PST) (envelope-from scottl@freebsd.org) Date: Sun, 18 Jan 2004 16:41:49 -0800 (PST) Message-Id: <200401190041.i0J0fnDi024710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 45565 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 00:41:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=45565 Change 45565 by scottl@scottl_netperf_socket on 2004/01/18 16:40:59 Merge ip_divert.h over since it's a new file. Affected files ... .. //depot/projects/netperf_socket/sys/netinet/ip_divert.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 18 17:19:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BABDD16A4D0; Sun, 18 Jan 2004 17:19:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 92D9D16A4CE for ; Sun, 18 Jan 2004 17:19:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8313E43D1F for ; Sun, 18 Jan 2004 17:19:47 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0J1Jl0B038527 for ; Sun, 18 Jan 2004 17:19:47 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0J1Jc3c038524 for perforce@freebsd.org; Sun, 18 Jan 2004 17:19:38 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 18 Jan 2004 17:19:38 -0800 (PST) Message-Id: <200401190119.i0J1Jc3c038524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 45569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 01:19:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=45569 Change 45569 by jmallett@jmallett_oingo on 2004/01/18 17:18:50 MFC. Affected files ... .. //depot/projects/mips/Makefile.inc1#19 integrate .. //depot/projects/mips/bin/Makefile#4 integrate .. //depot/projects/mips/contrib/libreadline/readline.h#4 integrate .. //depot/projects/mips/contrib/tcpdump/print-isakmp.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-l2tp.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-radius.c#3 integrate .. //depot/projects/mips/crypto/openssh/openbsd-compat/fake-rfc2553.h#2 integrate .. //depot/projects/mips/etc/rc.d/DAEMON#3 integrate .. //depot/projects/mips/etc/rc.d/LOGIN#3 integrate .. //depot/projects/mips/etc/rc.d/NETWORKING#6 integrate .. //depot/projects/mips/etc/rc.d/SERVERS#3 integrate .. //depot/projects/mips/etc/rc.d/accounting#3 integrate .. //depot/projects/mips/etc/rc.d/amd#3 integrate .. //depot/projects/mips/etc/rc.d/apmd#5 integrate .. //depot/projects/mips/etc/rc.d/bootparams#2 integrate .. //depot/projects/mips/etc/rc.d/ccd#2 integrate .. //depot/projects/mips/etc/rc.d/cleartmp#4 integrate .. //depot/projects/mips/etc/rc.d/cron#4 integrate .. //depot/projects/mips/etc/rc.d/dhclient#4 integrate .. //depot/projects/mips/etc/rc.d/fsck#3 integrate .. //depot/projects/mips/etc/rc.d/inetd#2 integrate .. //depot/projects/mips/etc/rc.d/ipfilter#9 integrate .. //depot/projects/mips/etc/rc.d/ipfs#3 integrate .. //depot/projects/mips/etc/rc.d/ipmon#5 integrate .. //depot/projects/mips/etc/rc.d/ipnat#7 integrate .. //depot/projects/mips/etc/rc.d/ipsec#4 integrate .. //depot/projects/mips/etc/rc.d/isdnd#6 integrate .. //depot/projects/mips/etc/rc.d/ldconfig#4 integrate .. //depot/projects/mips/etc/rc.d/local#4 integrate .. //depot/projects/mips/etc/rc.d/lpd#2 integrate .. //depot/projects/mips/etc/rc.d/motd#4 integrate .. //depot/projects/mips/etc/rc.d/mountcritlocal#4 integrate .. //depot/projects/mips/etc/rc.d/mountcritremote#5 integrate .. //depot/projects/mips/etc/rc.d/mountd#3 integrate .. //depot/projects/mips/etc/rc.d/moused#2 integrate .. //depot/projects/mips/etc/rc.d/mrouted#5 integrate .. //depot/projects/mips/etc/rc.d/named#4 integrate .. //depot/projects/mips/etc/rc.d/nfsd#4 integrate .. //depot/projects/mips/etc/rc.d/nfslocking#3 integrate .. //depot/projects/mips/etc/rc.d/ntpd#3 integrate .. //depot/projects/mips/etc/rc.d/ntpdate#3 integrate .. //depot/projects/mips/etc/rc.d/pwcheck#2 integrate .. //depot/projects/mips/etc/rc.d/rarpd#2 integrate .. //depot/projects/mips/etc/rc.d/root#5 integrate .. //depot/projects/mips/etc/rc.d/route6d#3 integrate .. //depot/projects/mips/etc/rc.d/routed#5 integrate .. //depot/projects/mips/etc/rc.d/rpcbind#2 integrate .. //depot/projects/mips/etc/rc.d/rtadvd#4 integrate .. //depot/projects/mips/etc/rc.d/rwho#2 integrate .. //depot/projects/mips/etc/rc.d/savecore#2 integrate .. //depot/projects/mips/etc/rc.d/securelevel#4 integrate .. //depot/projects/mips/etc/rc.d/sendmail#3 integrate .. //depot/projects/mips/etc/rc.d/sshd#3 integrate .. //depot/projects/mips/etc/rc.d/swap1#2 integrate .. //depot/projects/mips/etc/rc.d/sysctl#4 integrate .. //depot/projects/mips/etc/rc.d/syslogd#2 integrate .. //depot/projects/mips/etc/rc.d/timed#2 integrate .. //depot/projects/mips/etc/rc.d/ttys#3 integrate .. //depot/projects/mips/etc/rc.d/virecover#4 integrate .. //depot/projects/mips/etc/rc.d/ypbind#5 integrate .. //depot/projects/mips/etc/rc.d/yppasswdd#4 integrate .. //depot/projects/mips/etc/rc.d/ypserv#5 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes#13 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cc_int/Makefile#5 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cc_tools/Makefile#9 integrate .. //depot/projects/mips/gnu/usr.bin/cc/f771/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate .. //depot/projects/mips/include/netdb.h#3 integrate .. //depot/projects/mips/include/strings.h#2 integrate .. //depot/projects/mips/kerberos5/lib/libkafs5/Makefile#4 integrate .. //depot/projects/mips/lib/libalias/Makefile#4 integrate .. //depot/projects/mips/lib/libalias/alias.c#3 integrate .. //depot/projects/mips/lib/libalias/alias.h#3 integrate .. //depot/projects/mips/lib/libalias/alias_cuseeme.c#2 integrate .. //depot/projects/mips/lib/libalias/alias_db.c#3 integrate .. //depot/projects/mips/lib/libalias/alias_ftp.c#2 integrate .. //depot/projects/mips/lib/libalias/alias_irc.c#2 integrate .. //depot/projects/mips/lib/libalias/alias_local.h#3 integrate .. //depot/projects/mips/lib/libalias/alias_nbt.c#3 integrate .. //depot/projects/mips/lib/libalias/alias_old.c#1 branch .. //depot/projects/mips/lib/libalias/alias_pptp.c#2 integrate .. //depot/projects/mips/lib/libalias/alias_proxy.c#3 integrate .. //depot/projects/mips/lib/libalias/alias_skinny.c#2 integrate .. //depot/projects/mips/lib/libalias/alias_smedia.c#2 integrate .. //depot/projects/mips/lib/libalias/alias_util.c#2 integrate .. //depot/projects/mips/lib/libalias/libalias.3#3 integrate .. //depot/projects/mips/lib/libbsnmp/libbsnmp/Makefile#2 integrate .. //depot/projects/mips/lib/libc/Makefile#8 integrate .. //depot/projects/mips/lib/libc/alpha/_fpmath.h#4 integrate .. //depot/projects/mips/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/mips/lib/libc/gdtoa/Makefile.inc#4 integrate .. //depot/projects/mips/lib/libc/gdtoa/_hdtoa.c#1 branch .. //depot/projects/mips/lib/libc/gdtoa/_ldtoa.c#2 integrate .. //depot/projects/mips/lib/libc/gen/Makefile.inc#10 integrate .. //depot/projects/mips/lib/libc/gen/getpwent.c#7 integrate .. //depot/projects/mips/lib/libc/gen/pw_scan.c#3 integrate .. //depot/projects/mips/lib/libc/gen/sem.c#1 branch .. //depot/projects/mips/lib/libc/gen/sem_destroy.3#1 branch .. //depot/projects/mips/lib/libc/gen/sem_getvalue.3#1 branch .. //depot/projects/mips/lib/libc/gen/sem_init.3#1 branch .. //depot/projects/mips/lib/libc/gen/sem_open.3#1 branch .. //depot/projects/mips/lib/libc/gen/sem_post.3#1 branch .. //depot/projects/mips/lib/libc/gen/sem_wait.3#1 branch .. //depot/projects/mips/lib/libc/i386/_fpmath.h#3 integrate .. //depot/projects/mips/lib/libc/ia64/_fpmath.h#4 integrate .. //depot/projects/mips/lib/libc/include/fpmath.h#2 integrate .. //depot/projects/mips/lib/libc/powerpc/_fpmath.h#4 integrate .. //depot/projects/mips/lib/libc/rpc/Makefile.inc#4 integrate .. //depot/projects/mips/lib/libc/sparc64/_fpmath.h#3 integrate .. //depot/projects/mips/lib/libc/stdio/floatio.h#3 integrate .. //depot/projects/mips/lib/libc/stdio/vfprintf.c#8 integrate .. //depot/projects/mips/lib/libc/string/Makefile.inc#4 integrate .. //depot/projects/mips/lib/libc/string/ffs.3#3 integrate .. //depot/projects/mips/lib/libc/string/ffs.c#2 integrate .. //depot/projects/mips/lib/libc/string/ffsl.c#1 branch .. //depot/projects/mips/lib/libc/string/fls.c#1 branch .. //depot/projects/mips/lib/libc/string/flsl.c#1 branch .. //depot/projects/mips/lib/libc/sys/Makefile.inc#8 integrate .. //depot/projects/mips/lib/libc/sys/sem.c#4 delete .. //depot/projects/mips/lib/libc/sys/sigwait.2#1 branch .. //depot/projects/mips/lib/libc_r/Makefile#3 integrate .. //depot/projects/mips/lib/libc_r/man/Makefile.inc#6 delete .. //depot/projects/mips/lib/libc_r/man/pthread_attr.3#6 delete .. //depot/projects/mips/lib/libc_r/man/pthread_attr_get_np.3#7 delete .. //depot/projects/mips/lib/libc_r/man/pthread_attr_setcreatesuspend_np.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_cancel.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_cleanup_pop.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_cleanup_push.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_cond_broadcast.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_cond_destroy.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_cond_init.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_cond_signal.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_cond_timedwait.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_cond_wait.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_condattr.3#4 delete .. //depot/projects/mips/lib/libc_r/man/pthread_create.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_detach.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_equal.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_exit.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_getconcurrency.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_getspecific.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_join.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_key_create.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_key_delete.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_kill.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_main_np.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_multi_np.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_mutex_destroy.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_mutex_init.3#4 delete .. //depot/projects/mips/lib/libc_r/man/pthread_mutex_lock.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_mutex_trylock.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_mutex_unlock.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_mutexattr.3#4 delete .. //depot/projects/mips/lib/libc_r/man/pthread_mutexattr_getkind_np.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_once.3#4 delete .. //depot/projects/mips/lib/libc_r/man/pthread_resume_all_np.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_resume_np.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_rwlock_destroy.3#2 delete .. //depot/projects/mips/lib/libc_r/man/pthread_rwlock_init.3#2 delete .. //depot/projects/mips/lib/libc_r/man/pthread_rwlock_rdlock.3#2 delete .. //depot/projects/mips/lib/libc_r/man/pthread_rwlock_unlock.3#2 delete .. //depot/projects/mips/lib/libc_r/man/pthread_rwlock_wrlock.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_rwlockattr_destroy.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_rwlockattr_getpshared.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_rwlockattr_init.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_rwlockattr_setpshared.3#4 delete .. //depot/projects/mips/lib/libc_r/man/pthread_schedparam.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_self.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_set_name_np.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_setspecific.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_sigmask.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_suspend_all_np.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_suspend_np.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_switch_add_np.3#3 delete .. //depot/projects/mips/lib/libc_r/man/pthread_testcancel.3#3 delete .. //depot/projects/mips/lib/libc_r/man/sem_destroy.3#4 delete .. //depot/projects/mips/lib/libc_r/man/sem_getvalue.3#4 delete .. //depot/projects/mips/lib/libc_r/man/sem_init.3#4 delete .. //depot/projects/mips/lib/libc_r/man/sem_open.3#4 delete .. //depot/projects/mips/lib/libc_r/man/sem_post.3#4 delete .. //depot/projects/mips/lib/libc_r/man/sem_wait.3#4 delete .. //depot/projects/mips/lib/libc_r/man/sigwait.3#3 delete .. //depot/projects/mips/lib/libpam/Makefile.inc#5 integrate .. //depot/projects/mips/lib/libpam/libpam/Makefile#5 integrate .. //depot/projects/mips/lib/libpam/modules/pam_krb5/Makefile#3 integrate .. //depot/projects/mips/lib/libpam/modules/pam_ksu/Makefile#3 integrate .. //depot/projects/mips/lib/libpam/modules/pam_ssh/Makefile#4 integrate .. //depot/projects/mips/lib/libpam/modules/pam_unix/pam_unix.8#3 integrate .. //depot/projects/mips/lib/libpthread/man/Makefile.inc#4 delete .. //depot/projects/mips/lib/libpthread/man/pthread_attr.3#4 delete .. //depot/projects/mips/lib/libpthread/man/pthread_attr_get_np.3#4 delete .. //depot/projects/mips/lib/libpthread/man/pthread_cancel.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_cleanup_pop.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_cleanup_push.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_cond_broadcast.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_cond_destroy.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_cond_init.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_cond_signal.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_cond_timedwait.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_cond_wait.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_condattr.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_create.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_detach.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_equal.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_exit.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_getspecific.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_join.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_key_create.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_key_delete.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_kill.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_destroy.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_init.3#4 delete .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_lock.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_trylock.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_unlock.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_mutexattr.3#4 delete .. //depot/projects/mips/lib/libpthread/man/pthread_once.3#4 delete .. //depot/projects/mips/lib/libpthread/man/pthread_rwlock_destroy.3#2 delete .. //depot/projects/mips/lib/libpthread/man/pthread_rwlock_init.3#2 delete .. //depot/projects/mips/lib/libpthread/man/pthread_rwlock_rdlock.3#2 delete .. //depot/projects/mips/lib/libpthread/man/pthread_rwlock_unlock.3#2 delete .. //depot/projects/mips/lib/libpthread/man/pthread_rwlock_wrlock.3#4 delete .. //depot/projects/mips/lib/libpthread/man/pthread_rwlockattr_destroy.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_rwlockattr_getpshared.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_rwlockattr_init.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_rwlockattr_setpshared.3#4 delete .. //depot/projects/mips/lib/libpthread/man/pthread_schedparam.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_self.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_setspecific.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_sigmask.3#3 delete .. //depot/projects/mips/lib/libpthread/man/pthread_testcancel.3#3 delete .. //depot/projects/mips/lib/libpthread/man/sem_destroy.3#4 delete .. //depot/projects/mips/lib/libpthread/man/sem_getvalue.3#3 delete .. //depot/projects/mips/lib/libpthread/man/sem_init.3#3 delete .. //depot/projects/mips/lib/libpthread/man/sem_open.3#2 delete .. //depot/projects/mips/lib/libpthread/man/sem_post.3#3 delete .. //depot/projects/mips/lib/libpthread/man/sem_wait.3#3 delete .. //depot/projects/mips/lib/libpthread/man/sigwait.3#3 delete .. //depot/projects/mips/lib/libpthread/thread/thr_mutex.c#6 integrate .. //depot/projects/mips/lib/libstand/Makefile#8 integrate .. //depot/projects/mips/lib/libstand/splitfs.c#2 integrate .. //depot/projects/mips/lib/libstand/stand.h#4 integrate .. //depot/projects/mips/lib/libstand/zalloc_malloc.c#2 integrate .. //depot/projects/mips/lib/libthr/thread/thr_rwlock.c#2 integrate .. //depot/projects/mips/lib/libthr/thread/thr_suspend_np.c#2 integrate .. //depot/projects/mips/libexec/Makefile#6 integrate .. //depot/projects/mips/libexec/ftpd/ftpd.c#11 integrate .. //depot/projects/mips/release/Makefile#22 integrate .. //depot/projects/mips/release/Makefile.inc.docports#7 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/errata/article.sgml#14 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/early-adopter/article.sgml#8 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/errata/article.sgml#7 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml#2 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#9 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#7 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#10 integrate .. //depot/projects/mips/release/doc/share/sgml/release.ent#7 integrate .. //depot/projects/mips/release/scripts/print-cdrom-packages.sh#10 integrate .. //depot/projects/mips/release/scripts/proflibs-make.sh#2 integrate .. //depot/projects/mips/rescue/rescue/Makefile#3 integrate .. //depot/projects/mips/sbin/Makefile#12 integrate .. //depot/projects/mips/sbin/dump/dump.8#8 integrate .. //depot/projects/mips/sbin/ifconfig/ifmedia.c#4 integrate .. //depot/projects/mips/sbin/ipfw/ipfw.8#11 integrate .. //depot/projects/mips/sbin/mdconfig/mdconfig.8#6 integrate .. //depot/projects/mips/sbin/rtsol/Makefile#3 integrate .. //depot/projects/mips/secure/Makefile#3 integrate .. //depot/projects/mips/share/examples/bootforth/frames.4th#2 integrate .. //depot/projects/mips/share/examples/etc/make.conf#12 integrate .. //depot/projects/mips/share/man/man3/Makefile#3 integrate .. //depot/projects/mips/share/man/man3/pthread.3#4 integrate .. //depot/projects/mips/share/man/man3/pthread_attr.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_attr_get_np.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_attr_setcreatesuspend_np.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_cancel.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_cleanup_pop.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_cleanup_push.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_cond_broadcast.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_cond_destroy.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_cond_init.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_cond_signal.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_cond_timedwait.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_cond_wait.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_condattr.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_create.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_detach.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_equal.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_exit.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_getconcurrency.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_getspecific.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_join.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_key_create.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_key_delete.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_kill.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_main_np.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_multi_np.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_mutex_destroy.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_mutex_init.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_mutex_lock.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_mutex_timedlock.3#2 integrate .. //depot/projects/mips/share/man/man3/pthread_mutex_trylock.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_mutex_unlock.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_mutexattr.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_mutexattr_getkind_np.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_once.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_resume_all_np.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_resume_np.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_rwlock_destroy.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_rwlock_init.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_rwlock_rdlock.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_rwlock_timedrdlock.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_rwlock_timedwrlock.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_rwlock_unlock.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_rwlock_wrlock.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_rwlockattr_destroy.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_rwlockattr_getpshared.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_rwlockattr_init.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_rwlockattr_setpshared.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_schedparam.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_self.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_set_name_np.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_setspecific.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_sigmask.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_suspend_all_np.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_suspend_np.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_switch_add_np.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_testcancel.3#1 branch .. //depot/projects/mips/share/man/man4/Makefile#20 integrate .. //depot/projects/mips/share/man/man4/acpi.4#9 integrate .. //depot/projects/mips/share/man/man4/awi.4#4 integrate .. //depot/projects/mips/share/man/man4/crypto.4#4 integrate .. //depot/projects/mips/share/man/man4/man4.i386/Makefile#9 integrate .. //depot/projects/mips/share/man/man4/man4.i386/tx.4#3 delete .. //depot/projects/mips/share/man/man4/ng_rfc1490.4#2 integrate .. //depot/projects/mips/share/man/man4/polling.4#5 integrate .. //depot/projects/mips/share/man/man4/tx.4#1 branch .. //depot/projects/mips/share/man/man4/uscanner.4#6 integrate .. //depot/projects/mips/share/man/man5/hosts.lpd.5#2 integrate .. //depot/projects/mips/share/man/man9/Makefile#13 integrate .. //depot/projects/mips/share/man/man9/mbuf.9#9 integrate .. //depot/projects/mips/share/man/man9/vn_fullpath.9#1 branch .. //depot/projects/mips/share/misc/bsd-family-tree#8 integrate .. //depot/projects/mips/share/mk/bsd.dep.mk#4 integrate .. //depot/projects/mips/share/mk/bsd.lib.mk#4 integrate .. //depot/projects/mips/share/mk/bsd.obj.mk#3 integrate .. //depot/projects/mips/sys/Makefile#4 integrate .. //depot/projects/mips/sys/amd64/include/md_var.h#4 integrate .. //depot/projects/mips/sys/boot/forth/frames.4th#2 integrate .. //depot/projects/mips/sys/boot/i386/cdboot/cdboot.s#3 integrate .. //depot/projects/mips/sys/boot/pc98/libpc98/vidconsole.c#3 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_sa.c#11 integrate .. //depot/projects/mips/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/mips/sys/compat/linux/linux_util.c#5 integrate .. //depot/projects/mips/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/mips/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/mips/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/mips/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/mips/sys/compat/ndis/pe_var.h#3 integrate .. //depot/projects/mips/sys/compat/ndis/subr_hal.c#3 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/mips/sys/compat/ndis/subr_pe.c#4 integrate .. //depot/projects/mips/sys/conf/files#25 integrate .. //depot/projects/mips/sys/conf/files.alpha#9 integrate .. //depot/projects/mips/sys/conf/files.i386#16 integrate .. //depot/projects/mips/sys/conf/files.ia64#13 integrate .. //depot/projects/mips/sys/conf/files.mips#29 edit .. //depot/projects/mips/sys/conf/files.pc98#16 integrate .. //depot/projects/mips/sys/conf/files.powerpc#7 integrate .. //depot/projects/mips/sys/conf/files.sparc64#12 integrate .. //depot/projects/mips/sys/conf/kern.post.mk#12 integrate .. //depot/projects/mips/sys/conf/newvers.sh#8 integrate .. //depot/projects/mips/sys/conf/options.i386#14 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exstore.c#6 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_thermal.c#5 integrate .. //depot/projects/mips/sys/dev/acpica/acpivar.h#9 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.c#16 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.h#11 integrate .. //depot/projects/mips/sys/dev/ata/ata-card.c#10 integrate .. //depot/projects/mips/sys/dev/ata/ata-cbus.c#6 integrate .. //depot/projects/mips/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/mips/sys/dev/ata/ata-disk.c#14 integrate .. //depot/projects/mips/sys/dev/ata/ata-dma.c#9 integrate .. //depot/projects/mips/sys/dev/ata/ata-isa.c#8 integrate .. //depot/projects/mips/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/mips/sys/dev/ata/ata-pci.c#11 integrate .. //depot/projects/mips/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/mips/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/mips/sys/dev/ata/ata-raid.c#11 integrate .. //depot/projects/mips/sys/dev/ata/atapi-cam.c#9 integrate .. //depot/projects/mips/sys/dev/ata/atapi-cd.c#11 integrate .. //depot/projects/mips/sys/dev/ata/atapi-fd.c#9 integrate .. //depot/projects/mips/sys/dev/ata/atapi-tape.c#10 integrate .. //depot/projects/mips/sys/dev/awi/am79c930.c#4 integrate .. //depot/projects/mips/sys/dev/awi/am79c930reg.h#2 integrate .. //depot/projects/mips/sys/dev/awi/am79c930var.h#2 integrate .. //depot/projects/mips/sys/dev/awi/awi.c#7 integrate .. //depot/projects/mips/sys/dev/awi/awi_wep.c#5 delete .. //depot/projects/mips/sys/dev/awi/awi_wicfg.c#3 delete .. //depot/projects/mips/sys/dev/awi/awireg.h#2 integrate .. //depot/projects/mips/sys/dev/awi/awivar.h#3 integrate .. //depot/projects/mips/sys/dev/awi/if_awi_pccard.c#6 integrate .. //depot/projects/mips/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/mips/sys/dev/bktr/bktr_os.c#8 integrate .. //depot/projects/mips/sys/dev/ciss/ciss.c#13 integrate .. //depot/projects/mips/sys/dev/dpt/dpt_scsi.c#9 integrate .. //depot/projects/mips/sys/dev/firewire/fwohci.c#18 integrate .. //depot/projects/mips/sys/dev/gx/if_gx.c#7 integrate .. //depot/projects/mips/sys/dev/ida/ida.c#10 integrate .. //depot/projects/mips/sys/dev/ida/ida_disk.c#7 integrate .. //depot/projects/mips/sys/dev/ida/ida_eisa.c#6 integrate .. //depot/projects/mips/sys/dev/ida/ida_pci.c#6 integrate .. //depot/projects/mips/sys/dev/ida/idaio.h#1 branch .. //depot/projects/mips/sys/dev/ida/idareg.h#2 integrate .. //depot/projects/mips/sys/dev/ida/idavar.h#3 integrate .. //depot/projects/mips/sys/dev/idt/idt.c#6 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/mips/sys/dev/ips/ips.c#4 integrate .. //depot/projects/mips/sys/dev/ispfw/asm_12160.h#2 integrate .. //depot/projects/mips/sys/dev/ispfw/asm_2200.h#2 integrate .. //depot/projects/mips/sys/dev/ispfw/asm_2300.h#4 integrate .. //depot/projects/mips/sys/dev/md/md.c#17 integrate .. //depot/projects/mips/sys/dev/mii/ukphy.c#5 integrate .. //depot/projects/mips/sys/dev/mly/mly.c#10 integrate .. //depot/projects/mips/sys/dev/pci/pci_pci.c#8 integrate .. //depot/projects/mips/sys/dev/pdq/pdqvar.h#5 integrate .. //depot/projects/mips/sys/dev/ppbus/vpo.c#7 integrate .. //depot/projects/mips/sys/dev/sio/sio.c#11 integrate .. //depot/projects/mips/sys/dev/sound/pci/emu10k1.c#8 integrate .. //depot/projects/mips/sys/dev/sound/pci/neomagic-coeff.h#3 integrate .. //depot/projects/mips/sys/dev/sound/pcm/dsp.c#10 integrate .. //depot/projects/mips/sys/dev/sound/pcm/mixer.c#8 integrate .. //depot/projects/mips/sys/dev/sound/pcm/sound.c#8 integrate .. //depot/projects/mips/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/mips/sys/dev/sound/pcm/vchan.c#7 integrate .. //depot/projects/mips/sys/dev/usb/uhci.c#7 integrate .. //depot/projects/mips/sys/dev/usb/uhci_pci.c#6 integrate .. //depot/projects/mips/sys/dev/usb/umass.c#14 integrate .. //depot/projects/mips/sys/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/mips/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs.h#15 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs_data.h#15 integrate .. //depot/projects/mips/sys/fs/nullfs/null_vnops.c#7 integrate .. //depot/projects/mips/sys/fs/smbfs/smbfs_smb.c#6 integrate .. //depot/projects/mips/sys/fs/unionfs/union_subr.c#7 integrate .. //depot/projects/mips/sys/fs/unionfs/union_vnops.c#8 integrate .. //depot/projects/mips/sys/i386/acpica/acpi_toshiba.c#1 branch .. //depot/projects/mips/sys/i386/conf/NOTES#17 integrate .. //depot/projects/mips/sys/i386/i386/p4tcc.c#1 branch .. //depot/projects/mips/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/mips/sys/ia64/include/cpufunc.h#6 integrate .. //depot/projects/mips/sys/kern/init_main.c#15 integrate .. //depot/projects/mips/sys/kern/kern_descrip.c#16 integrate .. //depot/projects/mips/sys/kern/kern_intr.c#12 integrate .. //depot/projects/mips/sys/kern/sys_pipe.c#12 integrate .. //depot/projects/mips/sys/kern/uipc_cow.c#9 integrate .. //depot/projects/mips/sys/kern/uipc_socket.c#13 integrate .. //depot/projects/mips/sys/kern/uipc_syscalls.c#14 integrate .. //depot/projects/mips/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/mips/sys/kern/vfs_syscalls.c#14 integrate .. //depot/projects/mips/sys/libkern/ffs.c#3 integrate .. //depot/projects/mips/sys/libkern/ffsl.c#1 branch .. //depot/projects/mips/sys/libkern/fls.c#1 branch .. //depot/projects/mips/sys/libkern/flsl.c#1 branch .. //depot/projects/mips/sys/modules/Makefile#19 integrate .. //depot/projects/mips/sys/modules/acpi/Makefile#6 integrate .. //depot/projects/mips/sys/modules/acpi/Makefile.inc#1 branch .. //depot/projects/mips/sys/modules/acpi/acpi_toshiba/Makefile#1 branch .. //depot/projects/mips/sys/modules/awi/Makefile#2 integrate .. //depot/projects/mips/sys/modules/cx/Makefile#2 integrate .. //depot/projects/mips/sys/modules/drm/mga/Makefile#3 integrate .. //depot/projects/mips/sys/modules/drm/r128/Makefile#3 integrate .. //depot/projects/mips/sys/modules/drm/radeon/Makefile#3 integrate .. //depot/projects/mips/sys/modules/drm/sis/Makefile#2 integrate .. //depot/projects/mips/sys/modules/drm/tdfx/Makefile#2 integrate .. //depot/projects/mips/sys/modules/netgraph/bluetooth/bluetooth/Makefile#4 integrate .. //depot/projects/mips/sys/modules/netgraph/bluetooth/bt3c/Makefile#4 integrate .. //depot/projects/mips/sys/modules/netgraph/bluetooth/h4/Makefile#4 integrate .. //depot/projects/mips/sys/modules/netgraph/bluetooth/hci/Makefile#4 integrate .. //depot/projects/mips/sys/modules/netgraph/bluetooth/l2cap/Makefile#4 integrate .. //depot/projects/mips/sys/modules/netgraph/bluetooth/socket/Makefile#4 integrate .. //depot/projects/mips/sys/modules/netgraph/bluetooth/ubt/Makefile#4 integrate .. //depot/projects/mips/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#3 integrate .. //depot/projects/mips/sys/modules/netgraph/fec/Makefile#3 integrate .. //depot/projects/mips/sys/modules/ubsa/Makefile#2 integrate .. //depot/projects/mips/sys/modules/ucom/Makefile#2 integrate .. //depot/projects/mips/sys/modules/udf/Makefile#3 integrate .. //depot/projects/mips/sys/modules/ufm/Makefile#2 integrate .. //depot/projects/mips/sys/modules/uftdi/Makefile#2 integrate .. //depot/projects/mips/sys/modules/umct/Makefile#2 integrate .. //depot/projects/mips/sys/modules/uplcom/Makefile#3 integrate .. //depot/projects/mips/sys/modules/uvisor/Makefile#2 integrate .. //depot/projects/mips/sys/modules/uvscom/Makefile#3 integrate .. //depot/projects/mips/sys/net/if_media.h#4 integrate .. //depot/projects/mips/sys/net/if_vlan_var.h#8 integrate .. //depot/projects/mips/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/mips/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/mips/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/mips/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/mips/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/mips/sys/netgraph/ng_rfc1490.c#4 integrate .. //depot/projects/mips/sys/netgraph/ng_rfc1490.h#3 integrate .. //depot/projects/mips/sys/netinet/in_pcb.c#12 integrate .. //depot/projects/mips/sys/netinet/tcp.h#3 integrate .. //depot/projects/mips/sys/netinet6/in6_pcb.c#8 integrate .. //depot/projects/mips/sys/netinet6/ipsec.c#7 integrate .. //depot/projects/mips/sys/netkey/key.c#7 integrate .. //depot/projects/mips/sys/pc98/conf/NOTES#10 integrate .. //depot/projects/mips/sys/pci/ncr.c#7 integrate .. //depot/projects/mips/sys/powerpc/include/nexusvar.h#2 integrate .. //depot/projects/mips/sys/powerpc/include/openpicvar.h#2 integrate .. //depot/projects/mips/sys/powerpc/powermac/ata_macio.c#8 integrate .. //depot/projects/mips/sys/powerpc/powermac/hrowpic.c#3 integrate .. //depot/projects/mips/sys/powerpc/powermac/openpic_macio.c#1 branch .. //depot/projects/mips/sys/powerpc/powerpc/nexus.c#4 integrate .. //depot/projects/mips/sys/powerpc/powerpc/openpic.c#7 integrate .. //depot/projects/mips/sys/powerpc/psim/ata_iobus.c#6 integrate .. //depot/projects/mips/sys/powerpc/psim/openpic_iobus.c#1 branch .. //depot/projects/mips/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/mips/sys/sys/filedesc.h#7 integrate .. //depot/projects/mips/sys/sys/libkern.h#6 integrate .. //depot/projects/mips/sys/vm/uma_int.h#5 integrate .. //depot/projects/mips/sys/vm/vm_contig.c#7 integrate .. //depot/projects/mips/sys/vm/vm_extern.h#6 integrate .. //depot/projects/mips/sys/vm/vm_object.c#19 integrate .. //depot/projects/mips/tools/regression/lib/libc/stdio/test-scanfloat.c#2 integrate .. //depot/projects/mips/tools/tools/tinderbox/www/Makefile#3 integrate .. //depot/projects/mips/tools/tools/tinderbox/www/daemon.png#2 delete .. //depot/projects/mips/tools/tools/tinderbox/www/daemon.png.uu#1 branch .. //depot/projects/mips/tools/tools/tinderbox/www/valid-css.png#2 delete .. //depot/projects/mips/tools/tools/tinderbox/www/valid-css.png.uu#1 branch .. //depot/projects/mips/tools/tools/tinderbox/www/valid-xhtml10.png#2 delete .. //depot/projects/mips/tools/tools/tinderbox/www/valid-xhtml10.png.uu#1 branch .. //depot/projects/mips/usr.bin/Makefile#12 integrate .. //depot/projects/mips/usr.bin/chkey/Makefile#2 integrate .. //depot/projects/mips/usr.bin/chpass/chpass.c#5 integrate .. //depot/projects/mips/usr.bin/chpass/chpass.h#2 integrate .. //depot/projects/mips/usr.bin/chpass/field.c#3 integrate .. //depot/projects/mips/usr.bin/chpass/util.c#2 integrate .. //depot/projects/mips/usr.bin/killall/killall.1#3 integrate .. //depot/projects/mips/usr.bin/killall/killall.c#6 integrate .. //depot/projects/mips/usr.bin/make/var.c#9 integrate .. //depot/projects/mips/usr.bin/newkey/Makefile#2 integrate .. //depot/projects/mips/usr.bin/uac/uac.c#2 integrate .. //depot/projects/mips/usr.sbin/Makefile#14 integrate .. //depot/projects/mips/usr.sbin/acpi/iasl/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/cron/crontab/crontab.5#3 integrate .. //depot/projects/mips/usr.sbin/faithd/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/keyserv/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/mailwrapper/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/mtree/compare.c#5 integrate .. //depot/projects/mips/usr.sbin/mtree/create.c#6 integrate .. //depot/projects/mips/usr.sbin/mtree/extern.h#4 integrate .. //depot/projects/mips/usr.sbin/mtree/misc.c#4 integrate .. //depot/projects/mips/usr.sbin/mtree/mtree.8#4 integrate .. //depot/projects/mips/usr.sbin/mtree/mtree.c#6 integrate .. //depot/projects/mips/usr.sbin/mtree/verify.c#5 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/inf-token.l#3 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/inf.c#3 integrate .. //depot/projects/mips/usr.sbin/pccard/pccardd/pccardd.8#3 integrate .. //depot/projects/mips/usr.sbin/pkg_install/Makefile#4 integrate .. //depot/projects/mips/usr.sbin/pkg_install/Makefile.inc#2 integrate .. //depot/projects/mips/usr.sbin/pkg_install/add/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/pkg_install/create/Makefile#4 integrate .. //depot/projects/mips/usr.sbin/pkg_install/delete/Makefile#5 integrate .. //depot/projects/mips/usr.sbin/pkg_install/info/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/pkg_install/sign/Makefile#4 integrate .. //depot/projects/mips/usr.sbin/pkg_install/version/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/ppp/ppp.8.m4#5 integrate .. //depot/projects/mips/usr.sbin/pw/pw.8#4 integrate .. //depot/projects/mips/usr.sbin/pw/pw.c#2 integrate .. //depot/projects/mips/usr.sbin/pw/pw_group.c#2 integrate .. //depot/projects/mips/usr.sbin/pw/pw_user.c#4 integrate .. //depot/projects/mips/usr.sbin/rtsold/dump.c#3 integrate .. //depot/projects/mips/usr.sbin/rtsold/if.c#3 integrate .. //depot/projects/mips/usr.sbin/rtsold/probe.c#3 integrate .. //depot/projects/mips/usr.sbin/rtsold/rtsock.c#3 integrate .. //depot/projects/mips/usr.sbin/rtsold/rtsol.c#3 integrate .. //depot/projects/mips/usr.sbin/rtsold/rtsold.8#4 integrate .. //depot/projects/mips/usr.sbin/rtsold/rtsold.c#3 integrate .. //depot/projects/mips/usr.sbin/rtsold/rtsold.h#3 integrate .. //depot/projects/mips/usr.sbin/sysinstall/user.c#2 integrate Differences ... ==== //depot/projects/mips/Makefile.inc1#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.398 2003/12/09 00:42:44 gad Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.401 2004/01/17 01:24:13 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -272,7 +272,7 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/sys usr/lib \ + usr/bin usr/games usr/include/c++/3.3 usr/include/sys usr/lib \ usr/libexec usr/sbin usr/share/dict \ usr/share/groff_font/devX100 \ usr/share/groff_font/devX100-12 \ @@ -348,8 +348,9 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 4.2: building libraries" @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG -DNOLINT \ - libraries + cd ${.CURDIR}; \ + ${WMAKE} -DNOFSCHG -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPROFILE \ + libraries _depend: @echo @echo "--------------------------------------------------------------" @@ -633,6 +634,10 @@ .endif .endif +.if ${BOOTSTRAPPING} < 502102 +_lex= usr.bin/lex +.endif + .if ${BOOTSTRAPPING} < 450005 || \ ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034 _uudecode= usr.bin/uudecode @@ -664,6 +669,7 @@ ${_groff} \ gnu/usr.bin/texinfo \ usr.bin/colldef \ + ${_lex} \ usr.bin/makewhatis \ usr.bin/rpcgen \ ${_uudecode} \ ==== //depot/projects/mips/bin/Makefile#4 (text+ko) ==== @@ -1,11 +1,12 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.23 2003/02/18 19:51:58 obrien Exp $ +# $FreeBSD: src/bin/Makefile,v 1.24 2004/01/16 15:23:18 ru Exp $ SUBDIR= cat \ chflags \ chio \ chmod \ cp \ + ${_csh} \ date \ dd \ df \ @@ -24,8 +25,10 @@ pax \ ps \ pwd \ + ${_rcp} \ realpath \ rm \ + ${_rmail} \ rmdir \ setfacl \ sh \ @@ -35,15 +38,15 @@ test .if !defined(NO_RCMNDS) -SUBDIR+=rcp +_rcp= rcp .endif -.if !defined(NO_TCSH) -SUBDIR+=csh +.if !defined(NO_SENDMAIL) +_rmail= rmail .endif -.if !defined(NO_SENDMAIL) -SUBDIR+=rmail +.if !defined(NO_TCSH) +_csh= csh .endif .include ==== //depot/projects/mips/contrib/libreadline/readline.h#4 (text+ko) ==== @@ -20,7 +20,7 @@ have a copy of the license, write to the Free Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -/* $FreeBSD: src/contrib/libreadline/readline.h,v 1.14 2003/12/08 01:52:09 obrien Exp $ */ +/* $FreeBSD: src/contrib/libreadline/readline.h,v 1.15 2004/01/15 19:37:45 obrien Exp $ */ #if !defined (_READLINE_H_) #define _READLINE_H_ @@ -430,7 +430,7 @@ extern int rl_completion_mode PARAMS((rl_command_func_t *)); -#if 1 +#if !defined(RL_NO_COMPAT) /* Backwards compatibility (compat.c). These will go away sometime. */ extern void free_undo_list PARAMS((void)); extern int maybe_save_line PARAMS((void)); @@ -793,10 +793,12 @@ extern int rl_save_state PARAMS((struct readline_state *)); extern int rl_restore_state PARAMS((struct readline_state *)); +#if !defined(RL_NO_COMPAT) #if !defined (savestring) #define savestring rl_savestring extern char *savestring __P((char *)); /* XXX backwards compatibility */ #endif +#endif #ifdef __cplusplus } ==== //depot/projects/mips/contrib/tcpdump/print-isakmp.c#3 (text+ko) ==== @@ -332,9 +332,13 @@ static u_char *p; int i; + TCHECK2(*loc, len); + p = (u_char *)loc; for (i = 0; i < len; i++) printf("%02x", p[i] & 0xff); +trunc: + } struct attrmap { @@ -1060,6 +1064,8 @@ cp = (u_char *)ext; while (np) { + TCHECK2(*ext, sizeof(e)); + safememcpy(&e, ext, sizeof(e)); if (ep < (u_char *)ext + ntohs(e.len)) { @@ -1085,6 +1091,8 @@ ext = (struct isakmp_gen *)cp; } return cp; +trunc: + return NULL; } static char * ==== //depot/projects/mips/contrib/tcpdump/print-l2tp.c#3 (text+ko) ==== @@ -476,8 +476,17 @@ TCHECK(*ptr); /* Flags & Length */ len = EXTRACT_16BITS(ptr) & L2TP_AVP_HDR_LEN_MASK; - /* If it is not long enough to decode the entire AVP, we'll - abandon. */ + /* If it is not long enough to contain the header, we'll give up. */ + if (len < 6) + goto trunc; + + /* If it goes past the end of the remaining length of the packet, + we'll give up. */ + if (len > (u_int)length) + goto trunc; + + /* If it goes past the end of the remaining length of the captured + data, we'll give up. */ TCHECK2(*ptr, len); /* After this point, no need to worry about truncation */ ==== //depot/projects/mips/contrib/tcpdump/print-radius.c#3 (text+ko) ==== @@ -473,7 +473,7 @@ break; } - for (i=0; i < length ; i++, data++) + for (i=0; *data && i < length ; i++, data++) printf("%c",(*data < 32 || *data > 128) ? '.' : *data ); printf("}"); ==== //depot/projects/mips/crypto/openssh/openbsd-compat/fake-rfc2553.h#2 (text+ko) ==== @@ -1,4 +1,5 @@ /* $Id: fake-rfc2553.h,v 1.6.2.1 2003/09/22 02:09:18 dtucker Exp $ */ +/* $FreeBSD: src/crypto/openssh/openbsd-compat/fake-rfc2553.h,v 1.2 2004/01/18 22:31:30 des Exp $ */ /* * Copyright (C) 2000-2003 Damien Miller. All rights reserved. @@ -113,7 +114,7 @@ # define NI_MAXHOST 1025 #endif /* !NI_MAXHOST */ -#ifndef EAI_NODATA +#ifndef EAI_NONAME # define EAI_NODATA 1 # define EAI_MEMORY 2 # define EAI_NONAME 3 ==== //depot/projects/mips/etc/rc.d/DAEMON#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # # $NetBSD: DAEMON,v 1.8 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/DAEMON,v 1.3 2002/10/12 13:49:20 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/DAEMON,v 1.4 2004/01/17 10:16:38 mtm Exp $ # # PROVIDE: DAEMON # REQUIRE: NETWORKING SERVERS -# KEYWORD: FreeBSD NetBSD +# KEYWORD: FreeBSD # This is a dummy dependency, to ensure that general purpose daemons # are run _after_ the above are. ==== //depot/projects/mips/etc/rc.d/LOGIN#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # # $NetBSD: LOGIN,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/LOGIN,v 1.3 2002/10/12 13:49:20 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/LOGIN,v 1.4 2004/01/17 10:16:38 mtm Exp $ # # PROVIDE: LOGIN # REQUIRE: DAEMON -# KEYWORD: FreeBSD NetBSD +# KEYWORD: FreeBSD # This is a dummy dependency to ensure user services such as xdm, # inetd, cron and kerberos are started after everything else, in case ==== //depot/projects/mips/etc/rc.d/NETWORKING#6 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.6 2003/06/29 05:15:57 mtm Exp $ +# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.7 2004/01/17 10:16:38 mtm Exp $ # # PROVIDE: NETWORKING NETWORK # REQUIRE: network dhclient altqd netif routing network_ipv6 isdnd ppp-user # REQUIRE: routed mrouted route6d mroute6d -# KEYWORD: FreeBSD NetBSD +# KEYWORD: FreeBSD # This is a dummy dependency, for services which require networking # to be operational before starting. ==== //depot/projects/mips/etc/rc.d/SERVERS#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # # $NetBSD: SERVERS,v 1.9 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/SERVERS,v 1.3 2002/10/12 13:49:21 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/SERVERS,v 1.4 2004/01/17 10:16:38 mtm Exp $ # # PROVIDE: SERVERS # REQUIRE: mountcritremote -# KEYWORD: FreeBSD NetBSD +# KEYWORD: FreeBSD # This is a dummy dependency, for early-start servers relying on # some basic configuration. ==== //depot/projects/mips/etc/rc.d/accounting#3 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.4 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.6 2004/01/17 11:25:16 mtm Exp $ # # PROVIDE: accounting # REQUIRE: mountall # BEFORE: DAEMON -# KEYWORD: FreeBSD NetBSD +# KEYWORD: FreeBSD . /etc/rc.subr @@ -20,22 +20,16 @@ accounting_start() { - case ${OSTYPE} in - FreeBSD) - _dir=`dirname "$accounting_file"` - if [ ! -d `dirname "$_dir"` ]; then - if ! mkdir -p "$_dir"; then - warn "Could not create $_dir." - return 1 - fi + _dir=`dirname "$accounting_file"` + if [ ! -d `dirname "$_dir"` ]; then + if ! mkdir -p "$_dir"; then + warn "Could not create $_dir." + return 1 fi - if [ ! -e "$accounting_file" ]; then - touch "$accounting_file" - fi - ;; - *) - ;; - esac + fi + if [ ! -e "$accounting_file" ]; then + touch "$accounting_file" + fi if [ ! -f ${accounting_file} ]; then echo "Creating accounting file ${accounting_file}" ==== //depot/projects/mips/etc/rc.d/amd#3 (text+ko) ==== @@ -1,66 +1,51 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.9 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.11 2004/01/17 10:40:45 mtm Exp $ # # PROVIDE: amd # REQUIRE: rpcbind mountall ypbind nfsclient # BEFORE: DAEMON -# KEYWORD: FreeBSD NetBSD +# KEYWORD: FreeBSD . /etc/rc.subr name="amd" rcvar=`set_rcvar` command="/usr/sbin/${name}" - -case ${OSTYPE} in -FreeBSD) - start_precmd="amd_precmd" - command_args="&" - ;; -NetBSD) - command_args='-p -a '$amd_dir' -F /etc/amd.conf >/var/run/amd.pid' - required_dirs="$amd_dir" - required_files="/etc/amd.conf" - required_vars="rpcbind" - ;; -esac +start_precmd="amd_precmd" +command_args="&" amd_precmd() { - case ${OSTYPE} in - FreeBSD) - if ! checkyesno nfs_client_enable; then - force_depend nfsclient || return 1 - fi + if ! checkyesno nfs_client_enable; then + force_depend nfsclient || return 1 + fi - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 - fi + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi - case ${amd_map_program} in - [Nn][Oo] | '') >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 18 18:01:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F65616A4D0; Sun, 18 Jan 2004 18:01:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A55116A4CE for ; Sun, 18 Jan 2004 18:01:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D45843D2F for ; Sun, 18 Jan 2004 18:01:40 -0800 (PST) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0J21e0B048163 for ; Sun, 18 Jan 2004 18:01:40 -0800 (PST) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0J21eJB048154 for perforce@freebsd.org; Sun, 18 Jan 2004 18:01:40 -0800 (PST) (envelope-from scottl@freebsd.org) Date: Sun, 18 Jan 2004 18:01:40 -0800 (PST) Message-Id: <200401190201.i0J21eJB048154@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 45573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 02:01:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=45573 Change 45573 by scottl@scottl_netperf_socket on 2004/01/18 18:00:45 Fix some mis-merges. Affected files ... .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/net/if_ethersubr.c#2 (text+ko) ==== @@ -96,9 +96,6 @@ #endif /* NETATALK */ /* netgraph node hooks for ng_ether(4) */ -void (*ng_ether_input_p)(struct ifnet *ifp, struct mbuf **mp); -void (*ng_ether_input_orphan_p)(struct ifnet *ifp, struct mbuf *m); -int (*ng_ether_output_p)(struct ifnet *ifp, struct mbuf **mp); void (*ng_ether_attach_p)(struct ifnet *ifp); void (*ng_ether_detach_p)(struct ifnet *ifp); @@ -111,6 +108,10 @@ bdgtakeifaces_t *bdgtakeifaces_ptr; struct bdg_softc *ifp2sc; +#ifdef PFIL_HOOKS +struct pfil_head ether_pfil_hook; +#endif + static u_char etherbroadcastaddr[ETHER_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; @@ -297,20 +298,20 @@ return (0); /* XXX */ } } - - /* Handle ng_ether(4) processing, if any */ - if (ng_ether_output_p != NULL) { - if ((error = (*ng_ether_output_p)(ifp, &m)) != 0) { -bad: if (m != NULL) - m_freem(m); - return (error); - } - if (m == NULL) - return (0); - } - +#ifdef PFIL_HOOKS + /* + * Run through list of hooks for output packets. + */ + error = pfil_run_hooks(ðer_pfil_hook, &m, ifp, PFIL_OUT); + if (error != 0 || m == NULL) + goto bad; +#endif /* Continue with link-layer output */ return ether_output_frame(ifp, m); +bad: + if (m != NULL) + m_freem(m); + return (error); } /* @@ -322,12 +323,7 @@ int ether_output_frame(struct ifnet *ifp, struct mbuf *m) { - struct ip_fw *rule = NULL; - - /* Extract info from dummynet tag, ignore others */ - for (; m->m_type == MT_TAG; m = m->m_next) - if (m->m_flags == PACKET_TAG_DUMMYNET) - rule = ((struct dn_pkt *)m)->rule; + struct ip_fw *rule = ip_dn_find_rule(m); if (rule == NULL && BDG_ACTIVE(ifp)) { /* @@ -397,7 +393,6 @@ args.m = m; /* the packet we are looking at */ args.oif = dst; /* destination, if any */ - args.divert_rule = 0; /* we do not support divert yet */ args.rule = *rule; /* matching rule to restart */ args.next_hop = NULL; /* we do not support forward yet */ args.eh = &save_eh; /* MAC header for bridged/MAC packets */ @@ -536,14 +531,15 @@ } ifp->if_ibytes += m->m_pkthdr.len; - - /* Handle ng_ether(4) processing, if any */ - if (ng_ether_input_p != NULL) { - (*ng_ether_input_p)(ifp, &m); - if (m == NULL) - return; - } - +#ifdef PFIL_HOOKS + /* + * Run through list of hooks for input packets. + */ + if (pfil_run_hooks(&inet_pfil_hook, &m, ifp, PFIL_IN) != 0) + return; + if (m == NULL) /* consumed by filter */ + return; +#endif /* Check for bridging mode */ if (BDG_ACTIVE(ifp) ) { struct ifnet *bif; @@ -611,14 +607,7 @@ #if defined(NETATALK) struct llc *l; #endif - struct ip_fw *rule = NULL; - - /* Extract info from dummynet tag, ignore others */ - for (;m->m_type == MT_TAG; m = m->m_next) - if (m->m_flags == PACKET_TAG_DUMMYNET) { - rule = ((struct dn_pkt *)m)->rule; - ifp = m->m_next->m_pkthdr.rcvif; - } + struct ip_fw *rule = ip_dn_find_rule(m); KASSERT(ifp != NULL, ("ether_demux: NULL interface pointer")); @@ -783,20 +772,20 @@ discard: /* - * Packet is to be discarded. If netgraph is present, - * hand the packet to it for last chance processing; - * otherwise dispose of it. + * Packet is to be discarded. If let hooks have a + * last go at it before we reclaim storage. + */ +#ifdef PFIL_HOOKS + /* + * Put back the ethernet header so hooks have a + * consistent view of inbound packets. */ - if (ng_ether_input_orphan_p != NULL) { - /* - * Put back the ethernet header so netgraph has a - * consistent view of inbound packets. - */ - M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT); - (*ng_ether_input_orphan_p)(ifp, m); - return; - } - m_freem(m); + M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT); + if (pfil_run_hooks(ðer_pfil_hook, &m, ifp, PFIL_IN_DISCARD) != 0) + m = NULL; /* hook consumed packet, don't free */ +#endif + if (m != NULL) + m_freem(m); } /* @@ -1029,11 +1018,53 @@ } } +static int +ether_modinit(void) +{ +#ifdef PFIL_HOOKS + int error; + + ether_pfil_hook.ph_type = PFIL_TYPE_AF; + ether_pfil_hook.ph_af = AF_LINK; /* XXX */ + error = pfil_head_register(ðer_pfil_hook); + if (error != 0) + printf("%s: Unable to register hook, error %d\n", + __func__, error); + return error; +#else + return 0; +#endif +} + +static int +ether_moddestroy(void) +{ +#ifdef PFIL_HOOKS + (void) pfil_head_unregister(ðer_pfil_hook); +#endif + return 0; +} + +/* + * Module glue. + */ +static int +ether_modevent(module_t mod, int type, void *unused) +{ + switch (type) { + case MOD_LOAD: + return ether_modinit(); + case MOD_UNLOAD: + return ether_moddestroy(); + } + return EINVAL; +} + static moduledata_t ether_mod = { - "ether", - NULL, - 0 + "ether", + ether_modevent, + 0 }; - -DECLARE_MODULE(ether, ether_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); + +DECLARE_MODULE(ether, ether_mod, SI_SUB_PSEUDO, SI_ORDER_FIRST); MODULE_VERSION(ether, 1); ==== //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#3 (text+ko) ==== @@ -110,6 +110,7 @@ #include #include +#include #include static int ipfastforward_active = 0; @@ -132,7 +133,7 @@ struct ip *tip; struct mbuf *teem = NULL; #endif - struct mbuf *tag = NULL; + struct m_tag *mtag; struct route ro; struct sockaddr_in *dst = NULL; struct in_ifaddr *ia = NULL; @@ -150,16 +151,6 @@ if (!ipfastforward_active || !ipforwarding) return 0; - /* - * If there is any MT_TAG we fall back to ip_input because we can't - * handle TAGs here. Should never happen as we get directly called - * from the if_output routines. - */ - if (m->m_type == MT_TAG) { - KASSERT(0, ("%s: packet with MT_TAG not expected", __func__)); - return 0; - } - M_ASSERTVALID(m); M_ASSERTPKTHDR(m); @@ -373,25 +364,13 @@ /* * See if this is a fragment */ - if (ip->ip_off & (IP_MF | IP_OFFMASK)) { - MGETHDR(tag, M_DONTWAIT, MT_TAG); - if (tag == NULL) - goto drop; - tag->m_flags = PACKET_TAG_DIVERT; - tag->m_data = (caddr_t)(intptr_t)args.divert_rule; - tag->m_next = m; - /* XXX: really bloody hack, see ip_input */ - tag->m_nextpkt = (struct mbuf *)1; - m = tag; - tag = NULL; - + if (ip->ip_off & (IP_MF | IP_OFFMASK)) goto droptoours; - } /* * Tee packet */ if ((ipfw & IP_FW_PORT_TEE_FLAG) != 0) - teem = m_dup(m, M_DONTWAIT); + teem = divert_clone(m); else teem = m; if (teem == NULL) @@ -413,7 +392,7 @@ /* * Deliver packet to divert input routine */ - divert_packet(teem, 0, ipfw & 0xffff, args.divert_rule); + divert_packet(teem, 0); /* * If this was not tee, we are done */ @@ -560,27 +539,13 @@ /* * See if this is a fragment */ - if (ip->ip_off & (IP_MF | IP_OFFMASK)) { - MGETHDR(tag, M_DONTWAIT, MT_TAG); - if (tag == NULL) { - RTFREE(ro.ro_rt); - goto drop; - } - tag->m_flags = PACKET_TAG_DIVERT; - tag->m_data = (caddr_t)(intptr_t)args.divert_rule; - tag->m_next = m; - /* XXX: really bloody hack, see ip_input */ - tag->m_nextpkt = (struct mbuf *)1; - m = tag; - tag = NULL; - + if (ip->ip_off & (IP_MF | IP_OFFMASK)) goto droptoours; - } /* * Tee packet */ if ((ipfw & IP_FW_PORT_TEE_FLAG) != 0) - teem = m_dup(m, M_DONTWAIT); + teem = divert_clone(m); else teem = m; if (teem == NULL) @@ -602,7 +567,7 @@ /* * Deliver packet to divert input routine */ - divert_packet(teem, 0, ipfw & 0xffff, args.divert_rule); + divert_packet(teem, 0); /* * If this was not tee, we are done */ @@ -638,38 +603,24 @@ if (IA_SIN(ia)->sin_addr.s_addr == ip->ip_dst.s_addr) { forwardlocal: if (args.next_hop) { - /* XXX leak */ - MGETHDR(tag, M_DONTWAIT, MT_TAG); - if (tag == NULL) { + mtag = m_tag_get(PACKET_TAG_IPFORWARD, + sizeof(struct sockaddr_in *), + M_NOWAIT); + if (mtag == NULL) { + /* XXX statistic */ if (ro.ro_rt) RTFREE(ro.ro_rt); goto drop; } - tag->m_flags = PACKET_TAG_IPFORWARD; - tag->m_data = (caddr_t)args.next_hop; - tag->m_next = m; - /* XXX: really bloody hack, - * see ip_input */ - tag->m_nextpkt = (struct mbuf *)1; - m = tag; - tag = NULL; + *(struct sockaddr_in **)(mtag+1) = + args.next_hop; + m_tag_prepend(m, mtag); } #ifdef IPDIVERT droptoours: /* Used for DIVERT */ #endif - MGETHDR(tag, M_DONTWAIT, MT_TAG); - if (tag == NULL) { - if (ro.ro_rt) - RTFREE(ro.ro_rt); - goto drop; - } - tag->m_flags = PACKET_TAG_IPFASTFWD_OURS; - tag->m_data = NULL; - tag->m_next = m; - /* XXX: really bloody hack, see ip_input */ - tag->m_nextpkt = (struct mbuf *)1; - m = tag; - tag = NULL; + /* NB: ip_input understands this */ + m->m_flags |= M_FASTFWD_OURS; /* ip still points to the real packet */ ip->ip_len = htons(ip->ip_len); From owner-p4-projects@FreeBSD.ORG Sun Jan 18 18:41:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D57F316A4D0; Sun, 18 Jan 2004 18:41:30 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA40B16A4CE for ; Sun, 18 Jan 2004 18:41:30 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C1EF43D31 for ; Sun, 18 Jan 2004 18:41:29 -0800 (PST) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0J2fT0B057314 for ; Sun, 18 Jan 2004 18:41:29 -0800 (PST) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0J2fTBY057305 for perforce@freebsd.org; Sun, 18 Jan 2004 18:41:29 -0800 (PST) (envelope-from scottl@freebsd.org) Date: Sun, 18 Jan 2004 18:41:29 -0800 (PST) Message-Id: <200401190241.i0J2fTBY057305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 45575 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 02:41:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=45575 Change 45575 by scottl@scottl_netperf_socket on 2004/01/18 18:40:56 Fix two integration botches, stay tuned for more. Affected files ... .. //depot/projects/netperf_socket/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/netperf_socket/sys/net/route.c#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/kern/uipc_domain.c#3 (text+ko) ==== @@ -134,8 +134,8 @@ if (max_linkhdr < 16) /* XXX */ max_linkhdr = 16; - callout_init(&pffast_callout, 0); - callout_init(&pfslow_callout, 0); + callout_init(&pffast_callout, CALLOUT_MPSAFE); + callout_init(&pfslow_callout, CALLOUT_MPSAFE); callout_reset(&pffast_callout, 1, pffasttimo, NULL); callout_reset(&pfslow_callout, 1, pfslowtimo, NULL); ==== //depot/projects/netperf_socket/sys/net/route.c#2 (text+ko) ==== @@ -1320,5 +1320,46 @@ #undef senderr } +static void +rt_print_sockaddr(const char *leader, const char *tag, const struct sockaddr *sa) +{ + printf("%s%s: len %u af %u addr %7D\n", leader, tag, + sa->sa_len, sa->sa_family, + (const unsigned char *) sa->sa_data, ":"); +} + +static void +rt_print1(const char *leader, const char *tag, const struct rtentry *rt) +{ + printf("%s%s @%p: refcnt %ld flags 0x%lx\n", leader, tag, + rt, rt->rt_refcnt, rt->rt_flags); + printf("%sllinfo %p nodes %p %p\n", leader, + rt->rt_llinfo, &rt->rt_nodes[0], &rt->rt_nodes[1]); + if (rt->rt_gateway) + rt_print_sockaddr(leader, "gw", rt->rt_gateway); + if (rt_key(rt)) + rt_print_sockaddr(leader, "key", rt_key(rt)); + if (rt_mask(rt)) + rt_print_sockaddr(leader, "mask", rt_mask(rt)); + if (rt->rt_ifp) + printf("%sifp: %p (%s)\n", leader, + rt->rt_ifp, rt->rt_ifp->if_xname); + if (rt->rt_ifa) + printf("%sifa: %p\n", leader, rt->rt_ifa); /* XXX expand */ + if (rt->rt_genmask) + rt_print_sockaddr(leader, "genmask", rt->rt_genmask); + if (rt->rt_gwroute) + rt_print1(" ", "gwroute", rt->rt_gwroute); + if (rt->rt_parent) + rt_print1(" ", "parent", rt->rt_parent); + /* XXX rt_rmx */ +} + +void +rt_print(const struct rtentry *rt) +{ + rt_print1("", "route", rt); +} + /* This must be before ip6_init2(), which is now SI_ORDER_MIDDLE */ SYSINIT(route, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, route_init, 0); From owner-p4-projects@FreeBSD.ORG Sun Jan 18 18:52:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8EC0A16A4D0; Sun, 18 Jan 2004 18:52:44 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 68E3816A4CE for ; Sun, 18 Jan 2004 18:52:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 929B743D1D for ; Sun, 18 Jan 2004 18:52:43 -0800 (PST) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0J2qh0B060215 for ; Sun, 18 Jan 2004 18:52:43 -0800 (PST) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0J2qhMu060212 for perforce@freebsd.org; Sun, 18 Jan 2004 18:52:43 -0800 (PST) (envelope-from scottl@freebsd.org) Date: Sun, 18 Jan 2004 18:52:43 -0800 (PST) Message-Id: <200401190252.i0J2qhMu060212@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 45576 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 02:52:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=45576 Change 45576 by scottl@scottl_netperf_socket on 2004/01/18 18:51:50 Fix two more mis-merges. Affected files ... .. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#3 (text+ko) ==== @@ -541,7 +541,6 @@ struct socket *so; struct tcpcb *tp; - GIANT_REQUIRED; /* XXX until socket locking */ INP_INFO_WLOCK_ASSERT(&tcbinfo); /* ==== //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#2 (text+ko) ==== @@ -1302,7 +1302,7 @@ sipx->sipx_len = sizeof *sipx; sipx->sipx_family = AF_IPX; sipx->sipx_addr = ipxp->ipxp_faddr; - *nam = dup_sockaddr((struct sockaddr *)sipx, 0); + *nam = sodupsockaddr((struct sockaddr *)sipx, M_NOWAIT); return (0); } From owner-p4-projects@FreeBSD.ORG Sun Jan 18 20:18:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8296816A4D0; Sun, 18 Jan 2004 20:18:29 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5796616A4CE for ; Sun, 18 Jan 2004 20:18:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E16043D2D for ; Sun, 18 Jan 2004 20:18:27 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0J4IR0B078878 for ; Sun, 18 Jan 2004 20:18:27 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0J4IQs8078875 for perforce@freebsd.org; Sun, 18 Jan 2004 20:18:26 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2004 20:18:26 -0800 (PST) Message-Id: <200401190418.i0J4IQs8078875@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 45577 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 04:18:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=45577 Change 45577 by rwatson@rwatson_tislabs on 2004/01/18 20:17:42 Do include stubs for audit system calls in the !AUDIT case. Don't include unnecessary audit stubs for !AUDIT case. Audit cannot currently be loaded as a module, it must be compiled in. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/conf/files#5 edit .. //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#7 edit .. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#7 edit .. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#7 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#16 edit .. //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#7 edit .. //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#7 edit .. //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#7 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/conf/files#5 (text+ko) ==== @@ -1616,7 +1616,7 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard kern/uipc_sem.c optional p1003_1b_semaphores -security/audit/audit.c optional audit +security/audit/audit.c standard security/audit/bsm_audit.c optional audit security/audit/bsm_klib.c optional audit security/audit/bsm_token.c optional audit ==== //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#7 (text+ko) ==== @@ -469,14 +469,14 @@ { AS(extattr_list_file_args), (sy_call_t *)extattr_list_file }, /* 438 = extattr_list_file */ { AS(extattr_list_link_args), (sy_call_t *)extattr_list_link }, /* 439 = extattr_list_link */ { SYF_MPSAFE | AS(kse_switchin_args), (sy_call_t *)kse_switchin }, /* 440 = kse_switchin */ - { SYF_MPSAFE | AS(audit_args), (sy_call_t *)lkmressys }, /* 441 = audit */ - { SYF_MPSAFE | AS(auditon_args), (sy_call_t *)lkmressys }, /* 442 = auditon */ - { SYF_MPSAFE | AS(auditsvc_args), (sy_call_t *)lkmressys }, /* 443 = auditsvc */ - { SYF_MPSAFE | AS(getauid_args), (sy_call_t *)lkmressys }, /* 444 = getauid */ - { SYF_MPSAFE | AS(setauid_args), (sy_call_t *)lkmressys }, /* 445 = setauid */ - { SYF_MPSAFE | AS(getaudit_args), (sy_call_t *)lkmressys }, /* 446 = getaudit */ - { SYF_MPSAFE | AS(setaudit_args), (sy_call_t *)lkmressys }, /* 447 = setaudit */ - { SYF_MPSAFE | AS(getaudit_addr_args), (sy_call_t *)lkmressys }, /* 448 = getaudit_addr */ - { SYF_MPSAFE | AS(setaudit_addr_args), (sy_call_t *)lkmressys }, /* 449 = setaudit_addr */ - { SYF_MPSAFE | AS(auditctl_args), (sy_call_t *)lkmressys }, /* 450 = auditctl */ + { SYF_MPSAFE | AS(audit_args), (sy_call_t *)audit }, /* 441 = audit */ + { SYF_MPSAFE | AS(auditon_args), (sy_call_t *)auditon }, /* 442 = auditon */ + { SYF_MPSAFE | AS(auditsvc_args), (sy_call_t *)auditsvc }, /* 443 = auditsvc */ + { SYF_MPSAFE | AS(getauid_args), (sy_call_t *)getauid }, /* 444 = getauid */ + { SYF_MPSAFE | AS(setauid_args), (sy_call_t *)setauid }, /* 445 = setauid */ + { SYF_MPSAFE | AS(getaudit_args), (sy_call_t *)getaudit }, /* 446 = getaudit */ + { SYF_MPSAFE | AS(setaudit_args), (sy_call_t *)setaudit }, /* 447 = setaudit */ + { SYF_MPSAFE | AS(getaudit_addr_args), (sy_call_t *)getaudit_addr }, /* 448 = getaudit_addr */ + { SYF_MPSAFE | AS(setaudit_addr_args), (sy_call_t *)setaudit_addr }, /* 449 = setaudit_addr */ + { SYF_MPSAFE | AS(auditctl_args), (sy_call_t *)auditctl }, /* 450 = auditctl */ }; ==== //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#7 (text+ko) ==== ==== //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#7 (text+ko) ==== @@ -627,17 +627,17 @@ int attrnamespace, void *data, size_t nbytes); } 440 MSTD { int kse_switchin(const struct __mcontext *mcp, \ long val, long *loc); } -441 MNOSTD { int audit(const void *record, u_int length); } -442 MNOSTD { int auditon(int cmd, void *data, u_int length); } -443 MNOSTD { int auditsvc(int fd, int limit); } -444 MNOSTD { int getauid(uid_t *auid); } -445 MNOSTD { int setauid(uid_t *auid); } -446 MNOSTD { int getaudit(struct auditinfo *auditinfo); } -447 MNOSTD { int setaudit(struct auditinfo *auditinfo); } -448 MNOSTD { int getaudit_addr(struct auditinfo_addr \ +441 MSTD { int audit(const void *record, u_int length); } +442 MSTD { int auditon(int cmd, void *data, u_int length); } +443 MSTD { int auditsvc(int fd, int limit); } +444 MSTD { int getauid(uid_t *auid); } +445 MSTD { int setauid(uid_t *auid); } +446 MSTD { int getaudit(struct auditinfo *auditinfo); } +447 MSTD { int setaudit(struct auditinfo *auditinfo); } +448 MSTD { int getaudit_addr(struct auditinfo_addr \ *auditinfo_addr, u_int length); } -449 MNOSTD { int setaudit_addr(struct auditinfo_addr \ +449 MSTD { int setaudit_addr(struct auditinfo_addr \ *auditinfo_addr, u_int length); } -450 MNOSTD { int auditctl(char *path); } +450 MSTD { int auditctl(char *path); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#16 (text+ko) ==== @@ -1566,22 +1566,4 @@ return (ENOSYS); } -void -audit_proc_init(struct proc *p) -{ - -} - -void -audit_proc_fork(struct proc *parent, struct proc *child) -{ - -} - -void -audit_proc_free(struct proc *p) -{ - -} - #endif /* AUDIT */ ==== //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#7 (text+ko) ==== ==== //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#7 (text+ko) ==== ==== //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#7 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Jan 19 00:07:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6D6B16A4D0; Mon, 19 Jan 2004 00:07:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9DE1F16A4CE for ; Mon, 19 Jan 2004 00:07:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9245F43D1D for ; Mon, 19 Jan 2004 00:07:07 -0800 (PST) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0J8770B036523 for ; Mon, 19 Jan 2004 00:07:07 -0800 (PST) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0J877mJ036520 for perforce@freebsd.org; Mon, 19 Jan 2004 00:07:07 -0800 (PST) (envelope-from scottl@freebsd.org) Date: Mon, 19 Jan 2004 00:07:07 -0800 (PST) Message-Id: <200401190807.i0J877mJ036520@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 45585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 08:07:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=45585 Change 45585 by scottl@scottl_netperf_socket on 2004/01/19 00:07:01 Push down Giant to avoid LORs with the cred code. Affected files ... .. //depot/projects/netperf_socket/sys/kern/kern_jail.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_prot.c#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/kern/kern_jail.c#2 (text+ko) ==== @@ -255,7 +255,7 @@ prison_free(struct prison *pr) { - mtx_assert(&Giant, MA_OWNED); + mtx_lock(&Giant); mtx_lock(&allprison_mtx); mtx_lock(&pr->pr_mtx); pr->pr_ref--; @@ -273,6 +273,7 @@ } mtx_unlock(&pr->pr_mtx); mtx_unlock(&allprison_mtx); + mtx_unlock(&Giant); } void ==== //depot/projects/netperf_socket/sys/kern/kern_prot.c#2 (text+ko) ==== @@ -1752,7 +1752,6 @@ * allocate a uidinfo structure. */ mtx_unlock(mtxp); - mtx_lock(&Giant); if (cr->cr_uidinfo != NULL) uifree(cr->cr_uidinfo); if (cr->cr_ruidinfo != NULL) @@ -1766,7 +1765,6 @@ mac_destroy_cred(cr); #endif FREE(cr, M_CRED); - mtx_unlock(&Giant); } else { mtx_unlock(mtxp); } From owner-p4-projects@FreeBSD.ORG Mon Jan 19 09:51:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC70A16A4D0; Mon, 19 Jan 2004 09:51:05 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C637516A4CE for ; Mon, 19 Jan 2004 09:51:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C38843D48 for ; Mon, 19 Jan 2004 09:51:04 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0JHp40B084991 for ; Mon, 19 Jan 2004 09:51:04 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0JHp3Au084988 for perforce@freebsd.org; Mon, 19 Jan 2004 09:51:03 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 19 Jan 2004 09:51:03 -0800 (PST) Message-Id: <200401191751.i0JHp3Au084988@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 45600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 17:51:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=45600 Change 45600 by sam@sam_ebb on 2004/01/19 09:50:24 eliminate rt_print support; not needed Affected files ... .. //depot/projects/netperf_socket/sys/net/route.c#3 edit .. //depot/projects/netperf_socket/sys/net/route.h#3 edit Differences ... ==== //depot/projects/netperf_socket/sys/net/route.c#3 (text+ko) ==== @@ -1320,46 +1320,5 @@ #undef senderr } -static void -rt_print_sockaddr(const char *leader, const char *tag, const struct sockaddr *sa) -{ - printf("%s%s: len %u af %u addr %7D\n", leader, tag, - sa->sa_len, sa->sa_family, - (const unsigned char *) sa->sa_data, ":"); -} - -static void -rt_print1(const char *leader, const char *tag, const struct rtentry *rt) -{ - printf("%s%s @%p: refcnt %ld flags 0x%lx\n", leader, tag, - rt, rt->rt_refcnt, rt->rt_flags); - printf("%sllinfo %p nodes %p %p\n", leader, - rt->rt_llinfo, &rt->rt_nodes[0], &rt->rt_nodes[1]); - if (rt->rt_gateway) - rt_print_sockaddr(leader, "gw", rt->rt_gateway); - if (rt_key(rt)) - rt_print_sockaddr(leader, "key", rt_key(rt)); - if (rt_mask(rt)) - rt_print_sockaddr(leader, "mask", rt_mask(rt)); - if (rt->rt_ifp) - printf("%sifp: %p (%s)\n", leader, - rt->rt_ifp, rt->rt_ifp->if_xname); - if (rt->rt_ifa) - printf("%sifa: %p\n", leader, rt->rt_ifa); /* XXX expand */ - if (rt->rt_genmask) - rt_print_sockaddr(leader, "genmask", rt->rt_genmask); - if (rt->rt_gwroute) - rt_print1(" ", "gwroute", rt->rt_gwroute); - if (rt->rt_parent) - rt_print1(" ", "parent", rt->rt_parent); - /* XXX rt_rmx */ -} - -void -rt_print(const struct rtentry *rt) -{ - rt_print1("", "route", rt); -} - /* This must be before ip6_init2(), which is now SI_ORDER_MIDDLE */ SYSINIT(route, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, route_init, 0); ==== //depot/projects/netperf_socket/sys/net/route.h#3 (text+ko) ==== @@ -330,7 +330,6 @@ struct sockaddr *, struct sockaddr *, int, struct rtentry **); int rtrequest1(int, struct rt_addrinfo *, struct rtentry **); int rt_check(struct rtentry **, struct rtentry **, struct sockaddr *); -void rt_print(const struct rtentry *); #endif #endif From owner-p4-projects@FreeBSD.ORG Mon Jan 19 09:53:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1587116A4D0; Mon, 19 Jan 2004 09:53:12 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C753916A4CE for ; Mon, 19 Jan 2004 09:53:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E072A43D1F for ; Mon, 19 Jan 2004 09:53:07 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0JHr70B086722 for ; Mon, 19 Jan 2004 09:53:07 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0JHr7Ht086719 for perforce@freebsd.org; Mon, 19 Jan 2004 09:53:07 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 19 Jan 2004 09:53:07 -0800 (PST) Message-Id: <200401191753.i0JHr7Ht086719@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 45601 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 17:53:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=45601 Change 45601 by sam@sam_ebb on 2004/01/19 09:52:09 revert pfil_hooks changes unintentionally brought in during merge Affected files ... .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#3 edit Differences ... ==== //depot/projects/netperf_socket/sys/net/if_ethersubr.c#3 (text+ko) ==== @@ -96,6 +96,9 @@ #endif /* NETATALK */ /* netgraph node hooks for ng_ether(4) */ +void (*ng_ether_input_p)(struct ifnet *ifp, struct mbuf **mp); +void (*ng_ether_input_orphan_p)(struct ifnet *ifp, struct mbuf *m); +int (*ng_ether_output_p)(struct ifnet *ifp, struct mbuf **mp); void (*ng_ether_attach_p)(struct ifnet *ifp); void (*ng_ether_detach_p)(struct ifnet *ifp); @@ -108,10 +111,6 @@ bdgtakeifaces_t *bdgtakeifaces_ptr; struct bdg_softc *ifp2sc; -#ifdef PFIL_HOOKS -struct pfil_head ether_pfil_hook; -#endif - static u_char etherbroadcastaddr[ETHER_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; @@ -298,20 +297,20 @@ return (0); /* XXX */ } } -#ifdef PFIL_HOOKS - /* - * Run through list of hooks for output packets. - */ - error = pfil_run_hooks(ðer_pfil_hook, &m, ifp, PFIL_OUT); - if (error != 0 || m == NULL) - goto bad; -#endif + + /* Handle ng_ether(4) processing, if any */ + if (ng_ether_output_p != NULL) { + if ((error = (*ng_ether_output_p)(ifp, &m)) != 0) { +bad: if (m != NULL) + m_freem(m); + return (error); + } + if (m == NULL) + return (0); + } + /* Continue with link-layer output */ return ether_output_frame(ifp, m); -bad: - if (m != NULL) - m_freem(m); - return (error); } /* @@ -531,15 +530,14 @@ } ifp->if_ibytes += m->m_pkthdr.len; -#ifdef PFIL_HOOKS - /* - * Run through list of hooks for input packets. - */ - if (pfil_run_hooks(&inet_pfil_hook, &m, ifp, PFIL_IN) != 0) - return; - if (m == NULL) /* consumed by filter */ - return; -#endif + + /* Handle ng_ether(4) processing, if any */ + if (ng_ether_input_p != NULL) { + (*ng_ether_input_p)(ifp, &m); + if (m == NULL) + return; + } + /* Check for bridging mode */ if (BDG_ACTIVE(ifp) ) { struct ifnet *bif; @@ -772,20 +770,20 @@ discard: /* - * Packet is to be discarded. If let hooks have a - * last go at it before we reclaim storage. + * Packet is to be discarded. If netgraph is present, + * hand the packet to it for last chance processing; + * otherwise dispose of it. */ -#ifdef PFIL_HOOKS - /* - * Put back the ethernet header so hooks have a - * consistent view of inbound packets. - */ - M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT); - if (pfil_run_hooks(ðer_pfil_hook, &m, ifp, PFIL_IN_DISCARD) != 0) - m = NULL; /* hook consumed packet, don't free */ -#endif - if (m != NULL) - m_freem(m); + if (ng_ether_input_orphan_p != NULL) { + /* + * Put back the ethernet header so netgraph has a + * consistent view of inbound packets. + */ + M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT); + (*ng_ether_input_orphan_p)(ifp, m); + return; + } + m_freem(m); } /* @@ -1018,53 +1016,11 @@ } } -static int -ether_modinit(void) -{ -#ifdef PFIL_HOOKS - int error; - - ether_pfil_hook.ph_type = PFIL_TYPE_AF; - ether_pfil_hook.ph_af = AF_LINK; /* XXX */ - error = pfil_head_register(ðer_pfil_hook); - if (error != 0) - printf("%s: Unable to register hook, error %d\n", - __func__, error); - return error; -#else - return 0; -#endif -} - -static int -ether_moddestroy(void) -{ -#ifdef PFIL_HOOKS - (void) pfil_head_unregister(ðer_pfil_hook); -#endif - return 0; -} - -/* - * Module glue. - */ -static int -ether_modevent(module_t mod, int type, void *unused) -{ - switch (type) { - case MOD_LOAD: - return ether_modinit(); - case MOD_UNLOAD: - return ether_moddestroy(); - } - return EINVAL; -} - static moduledata_t ether_mod = { - "ether", - ether_modevent, - 0 + "ether", + NULL, + 0 }; - -DECLARE_MODULE(ether, ether_mod, SI_SUB_PSEUDO, SI_ORDER_FIRST); + +DECLARE_MODULE(ether, ether_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); MODULE_VERSION(ether, 1); From owner-p4-projects@FreeBSD.ORG Mon Jan 19 09:57:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B92116A4D0; Mon, 19 Jan 2004 09:57:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7521416A4CE for ; Mon, 19 Jan 2004 09:57:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C4FD43D1D for ; Mon, 19 Jan 2004 09:57:13 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0JHvD0B086857 for ; Mon, 19 Jan 2004 09:57:13 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0JHvDH7086854 for perforce@freebsd.org; Mon, 19 Jan 2004 09:57:13 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 19 Jan 2004 09:57:13 -0800 (PST) Message-Id: <200401191757.i0JHvDH7086854@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 45602 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 17:57:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=45602 Change 45602 by sam@sam_ebb on 2004/01/19 09:56:28 remove debugging stuff unintentionally brought in during merge Affected files ... .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#3 edit Differences ... ==== //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#3 (text+ko) ==== @@ -74,8 +74,6 @@ #define DEBUG_EXPIRE 0x08 #define DEBUG_XMIT 0x10 #define DEBUG_PIM 0x20 -SYSCTL_INT(_net_inet_ip, OID_AUTO, mrtdebug, CTLFLAG_RW, - &mrtdebug, 0, "multicast routing debug control"); #define VIFI_INVALID ((vifi_t) -1) @@ -614,27 +612,17 @@ ip_mrouter_init(struct socket *so, int version) { if (mrtdebug) - log(LOG_DEBUG, "%s: so_type = %d, pr_protocol = %d\n", __func__, + log(LOG_DEBUG, "ip_mrouter_init: so_type = %d, pr_protocol = %d\n", so->so_type, so->so_proto->pr_protocol); - if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_IGMP) { - if (mrtdebug) - log(LOG_DEBUG, "%s: invalid socket, type %u protocol %u\n", - __func__, so->so_type, so->so_proto->pr_protocol); + if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_IGMP) return EOPNOTSUPP; - } - if (version != 1) { - if (mrtdebug) - log(LOG_DEBUG, "%s: bad version %u, expecting 1\n", - __func__, version); + if (version != 1) return ENOPROTOOPT; - } mtx_lock(&mrouter_mtx); - mtx_lock(&mrouter_mtx); - if (ip_mrouter != NULL) { mtx_unlock(&mrouter_mtx); return EADDRINUSE; @@ -651,7 +639,7 @@ mtx_unlock(&mrouter_mtx); if (mrtdebug) - log(LOG_DEBUG, "%s: done\n", __func__); + log(LOG_DEBUG, "ip_mrouter_init\n"); return 0; } @@ -757,7 +745,7 @@ mtx_unlock(&mrouter_mtx); if (mrtdebug) - log(LOG_DEBUG, "%s: end\n", __func__); + log(LOG_DEBUG, "ip_mrouter_done\n"); return 0; } From owner-p4-projects@FreeBSD.ORG Mon Jan 19 09:59:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 613E716A4D0; Mon, 19 Jan 2004 09:59:23 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 21DE316A4CE for ; Mon, 19 Jan 2004 09:59:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D56243D39 for ; Mon, 19 Jan 2004 09:59:16 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0JHxG0B086951 for ; Mon, 19 Jan 2004 09:59:16 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0JHxG4t086948 for perforce@freebsd.org; Mon, 19 Jan 2004 09:59:16 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 19 Jan 2004 09:59:16 -0800 (PST) Message-Id: <200401191759.i0JHxG4t086948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 45603 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 17:59:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=45603 Change 45603 by sam@sam_ebb on 2004/01/19 09:58:47 revert sockaddr assignment optimization not directly related to socket locking; this should be kept separate Affected files ... .. //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#3 edit Differences ... ==== //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#3 (text+ko) ==== @@ -248,6 +248,7 @@ struct icmp *icp; struct in_ifaddr *ia; struct ip *ip = mtod(m, struct ip *); + struct sockaddr_in icmpsrc, icmpdst, icmpgw; int hlen = off; int icmplen = ip->ip_len; int i, code; @@ -310,6 +311,17 @@ if (icp->icmp_type > ICMP_MAXTYPE) goto raw; + /* Initialize */ + bzero(&icmpsrc, sizeof(icmpsrc)); + icmpsrc.sin_len = sizeof(struct sockaddr_in); + icmpsrc.sin_family = AF_INET; + bzero(&icmpdst, sizeof(icmpdst)); + icmpdst.sin_len = sizeof(struct sockaddr_in); + icmpdst.sin_family = AF_INET; + bzero(&icmpgw, sizeof(icmpgw)); + icmpgw.sin_len = sizeof(struct sockaddr_in); + icmpgw.sin_family = AF_INET; + icmpstat.icps_inhist[icp->icmp_type]++; code = icp->icmp_code; switch (icp->icmp_type) { @@ -369,10 +381,7 @@ if (code) goto badcode; code = PRC_QUENCH; - deliver: { - struct sockaddr_in icmpsrc = - { sizeof(struct sockaddr_in), AF_INET }; - + deliver: /* * Problem with datagram; advise higher level routines. */ @@ -442,7 +451,6 @@ (*ctlfunc)(code, (struct sockaddr *)&icmpsrc, (void *)&icp->icmp_ip); break; - } badcode: icmpstat.icps_badcode++; @@ -478,10 +486,7 @@ else goto reflect; - case ICMP_MASKREQ: { - struct sockaddr_in icmpdst = - { sizeof(struct sockaddr_in), AF_INET }; - + case ICMP_MASKREQ: if (icmpmaskrepl == 0) break; /* @@ -523,16 +528,8 @@ icmpstat.icps_outhist[icp->icmp_type]++; icmp_reflect(m); return; - } - case ICMP_REDIRECT: { - struct sockaddr_in icmpsrc = - { sizeof(struct sockaddr_in), AF_INET }; - struct sockaddr_in icmpdst = - { sizeof(struct sockaddr_in), AF_INET }; - struct sockaddr_in icmpgw = - { sizeof(struct sockaddr_in), AF_INET }; - + case ICMP_REDIRECT: if (log_redirect) { u_long src, dst, gw; @@ -589,7 +586,6 @@ key_sa_routechange((struct sockaddr *)&icmpsrc); #endif break; - } /* * No kernel processing for the following; From owner-p4-projects@FreeBSD.ORG Tue Jan 20 10:21:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0168816A4D0; Tue, 20 Jan 2004 10:21:58 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C3C2916A4CE for ; Tue, 20 Jan 2004 10:21:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 996FB43D2D for ; Tue, 20 Jan 2004 10:21:39 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0KILd0B058758 for ; Tue, 20 Jan 2004 10:21:39 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0KILdpO058749 for perforce@freebsd.org; Tue, 20 Jan 2004 10:21:39 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 20 Jan 2004 10:21:39 -0800 (PST) Message-Id: <200401201821.i0KILdpO058749@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 45643 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jan 2004 18:21:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=45643 Change 45643 by rwatson@rwatson_tislabs on 2004/01/20 10:20:38 Pay attention to mac_portacl_enabled. Submitted by: simon@FreeBSD.org Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_portacl/mac_portacl.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_portacl/mac_portacl.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003 Networks Associates Technology, Inc. + * Copyright (c) 2003-2004 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by Network @@ -451,6 +451,10 @@ int family, type; u_int16_t port; + /* Only run if we are enabled. */ + if (mac_portacl_enabled == 0) + return (0); + /* Only interested in IPv4 and IPv6 sockets. */ if (so->so_proto->pr_domain->dom_family != PF_INET && so->so_proto->pr_domain->dom_family != PF_INET6) From owner-p4-projects@FreeBSD.ORG Tue Jan 20 11:48:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72CA716A4ED; Tue, 20 Jan 2004 11:48:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 41ABC16A4E4 for ; Tue, 20 Jan 2004 11:48:28 -0800 (PST) Received: from mail1.speakeasy.net (mail1.speakeasy.net [216.254.0.201]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E4C143D64 for ; Tue, 20 Jan 2004 11:48:20 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 17993 invoked from network); 20 Jan 2004 19:48:20 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 20 Jan 2004 19:48:20 -0000 Received: from 10.50.41.236 (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.10/8.12.10) with ESMTP id i0KJieMC014221; Tue, 20 Jan 2004 14:48:10 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Scott Long , Perforce Change Reviews Date: Tue, 20 Jan 2004 14:15:51 -0500 User-Agent: KMail/1.5.4 References: <200401190807.i0J877mJ036520@repoman.freebsd.org> In-Reply-To: <200401190807.i0J877mJ036520@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200401201415.51834.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) Subject: Re: PERFORCE change 45585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jan 2004 19:48:29 -0000 On Monday 19 January 2004 03:07 am, Scott Long wrote: > http://perforce.freebsd.org/chv.cgi?CH=45585 > > Change 45585 by scottl@scottl_netperf_socket on 2004/01/19 00:07:01 > > Push down Giant to avoid LORs with the cred code. You can actually push it down to the vrele(). -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Thu Jan 22 17:22:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A994916A4D0; Thu, 22 Jan 2004 17:22:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 67CA616A4CE for ; Thu, 22 Jan 2004 17:22:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89BED43D41 for ; Thu, 22 Jan 2004 17:22:13 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0N1MD0B098761 for ; Thu, 22 Jan 2004 17:22:13 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0N1LxAj098568 for perforce@freebsd.org; Thu, 22 Jan 2004 17:21:59 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 22 Jan 2004 17:21:59 -0800 (PST) Message-Id: <200401230121.i0N1LxAj098568@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 45755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jan 2004 01:22:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=45755 Change 45755 by peter@peter_daintree on 2004/01/22 17:21:50 IFC @45754 Affected files ... .. //depot/projects/hammer/Makefile.inc1#35 integrate .. //depot/projects/hammer/bin/Makefile#3 integrate .. //depot/projects/hammer/bin/ls/print.c#8 integrate .. //depot/projects/hammer/bin/ps/ps.1#9 integrate .. //depot/projects/hammer/bin/sh/Makefile#4 integrate .. //depot/projects/hammer/bin/sh/eval.c#5 integrate .. //depot/projects/hammer/bin/sh/input.c#3 integrate .. //depot/projects/hammer/bin/sh/parser.c#6 integrate .. //depot/projects/hammer/bin/sh/redir.c#4 integrate .. //depot/projects/hammer/bin/sh/redir.h#2 integrate .. //depot/projects/hammer/contrib/cvs/src/modules.c#3 integrate .. //depot/projects/hammer/contrib/cvs/src/server.c#4 integrate .. //depot/projects/hammer/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/FREEBSD-upgrade#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.c#6 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/convert.c#2 delete .. //depot/projects/hammer/contrib/isc-dhcp/common/errwarn.c#2 delete .. //depot/projects/hammer/contrib/isc-dhcp/common/hash.c#2 delete .. //depot/projects/hammer/contrib/isc-dhcp/common/inet_addr.c#2 delete .. //depot/projects/hammer/contrib/isc-dhcp/includes/hash.h#2 delete .. //depot/projects/hammer/contrib/isc-dhcp/includes/sysconf.h#2 delete .. //depot/projects/hammer/contrib/libreadline/readline.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-isakmp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-l2tp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-radius.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-rfc2553.h#2 integrate .. //depot/projects/hammer/crypto/openssh/progressmeter.c#3 integrate .. //depot/projects/hammer/crypto/openssh/servconf.c#5 integrate .. //depot/projects/hammer/crypto/openssl/apps/openssl.cnf#3 integrate .. //depot/projects/hammer/etc/Makefile#22 integrate .. //depot/projects/hammer/etc/defaults/devfs.rules#3 integrate .. //depot/projects/hammer/etc/isdn/Makefile#3 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#17 integrate .. //depot/projects/hammer/etc/mtree/BSD.var.dist#5 integrate .. //depot/projects/hammer/etc/rc.d/DAEMON#3 integrate .. //depot/projects/hammer/etc/rc.d/LOGIN#3 integrate .. //depot/projects/hammer/etc/rc.d/NETWORKING#6 integrate .. //depot/projects/hammer/etc/rc.d/SERVERS#3 integrate .. //depot/projects/hammer/etc/rc.d/accounting#4 integrate .. //depot/projects/hammer/etc/rc.d/amd#5 integrate .. //depot/projects/hammer/etc/rc.d/apmd#7 integrate .. //depot/projects/hammer/etc/rc.d/bootparams#3 integrate .. //depot/projects/hammer/etc/rc.d/ccd#2 integrate .. //depot/projects/hammer/etc/rc.d/cleartmp#5 integrate .. //depot/projects/hammer/etc/rc.d/cron#4 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#7 integrate .. //depot/projects/hammer/etc/rc.d/fsck#4 integrate .. //depot/projects/hammer/etc/rc.d/inetd#2 integrate .. //depot/projects/hammer/etc/rc.d/ipfilter#13 integrate .. //depot/projects/hammer/etc/rc.d/ipfs#3 integrate .. //depot/projects/hammer/etc/rc.d/ipmon#6 integrate .. //depot/projects/hammer/etc/rc.d/ipnat#9 integrate .. //depot/projects/hammer/etc/rc.d/ipsec#5 integrate .. //depot/projects/hammer/etc/rc.d/isdnd#7 integrate .. //depot/projects/hammer/etc/rc.d/ldconfig#8 integrate .. //depot/projects/hammer/etc/rc.d/local#4 integrate .. //depot/projects/hammer/etc/rc.d/lpd#3 integrate .. //depot/projects/hammer/etc/rc.d/motd#6 integrate .. //depot/projects/hammer/etc/rc.d/mountcritlocal#7 integrate .. //depot/projects/hammer/etc/rc.d/mountcritremote#6 integrate .. //depot/projects/hammer/etc/rc.d/mountd#4 integrate .. //depot/projects/hammer/etc/rc.d/moused#4 integrate .. //depot/projects/hammer/etc/rc.d/mrouted#5 integrate .. //depot/projects/hammer/etc/rc.d/named#5 integrate .. //depot/projects/hammer/etc/rc.d/nfsd#5 integrate .. //depot/projects/hammer/etc/rc.d/nfslocking#4 integrate .. //depot/projects/hammer/etc/rc.d/ntpd#4 integrate .. //depot/projects/hammer/etc/rc.d/ntpdate#4 integrate .. //depot/projects/hammer/etc/rc.d/pwcheck#2 integrate .. //depot/projects/hammer/etc/rc.d/rarpd#2 integrate .. //depot/projects/hammer/etc/rc.d/root#6 integrate .. //depot/projects/hammer/etc/rc.d/route6d#4 integrate .. //depot/projects/hammer/etc/rc.d/routed#6 integrate .. //depot/projects/hammer/etc/rc.d/rpcbind#3 integrate .. //depot/projects/hammer/etc/rc.d/rtadvd#5 integrate .. //depot/projects/hammer/etc/rc.d/rwho#2 integrate .. //depot/projects/hammer/etc/rc.d/savecore#3 integrate .. //depot/projects/hammer/etc/rc.d/securelevel#5 integrate .. //depot/projects/hammer/etc/rc.d/sendmail#5 integrate .. //depot/projects/hammer/etc/rc.d/sshd#3 integrate .. //depot/projects/hammer/etc/rc.d/swap1#3 integrate .. //depot/projects/hammer/etc/rc.d/sysctl#5 integrate .. //depot/projects/hammer/etc/rc.d/syslogd#4 integrate .. //depot/projects/hammer/etc/rc.d/timed#2 integrate .. //depot/projects/hammer/etc/rc.d/ttys#4 integrate .. //depot/projects/hammer/etc/rc.d/virecover#5 integrate .. //depot/projects/hammer/etc/rc.d/ypbind#6 integrate .. //depot/projects/hammer/etc/rc.d/yppasswdd#5 integrate .. //depot/projects/hammer/etc/rc.d/ypserv#6 integrate .. //depot/projects/hammer/etc/rc.subr#11 integrate .. //depot/projects/hammer/etc/rc.suspend#3 integrate .. //depot/projects/hammer/etc/sendmail/Makefile#7 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#17 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2#11 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_int/Makefile#9 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#12 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/f771/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#13 integrate .. //depot/projects/hammer/include/netdb.h#4 integrate .. //depot/projects/hammer/include/nss.h#2 integrate .. //depot/projects/hammer/include/strings.h#3 integrate .. //depot/projects/hammer/kerberos5/lib/libkafs5/Makefile#4 integrate .. //depot/projects/hammer/lib/csu/i386-elf/Makefile#4 integrate .. //depot/projects/hammer/lib/libalias/Makefile#6 integrate .. //depot/projects/hammer/lib/libalias/alias.c#4 integrate .. //depot/projects/hammer/lib/libalias/alias.h#4 integrate .. //depot/projects/hammer/lib/libalias/alias_cuseeme.c#2 integrate .. //depot/projects/hammer/lib/libalias/alias_db.c#5 integrate .. //depot/projects/hammer/lib/libalias/alias_ftp.c#2 integrate .. //depot/projects/hammer/lib/libalias/alias_irc.c#2 integrate .. //depot/projects/hammer/lib/libalias/alias_local.h#3 integrate .. //depot/projects/hammer/lib/libalias/alias_nbt.c#3 integrate .. //depot/projects/hammer/lib/libalias/alias_old.c#1 branch .. //depot/projects/hammer/lib/libalias/alias_pptp.c#2 integrate .. //depot/projects/hammer/lib/libalias/alias_proxy.c#3 integrate .. //depot/projects/hammer/lib/libalias/alias_skinny.c#2 integrate .. //depot/projects/hammer/lib/libalias/alias_smedia.c#2 integrate .. //depot/projects/hammer/lib/libalias/alias_util.c#2 integrate .. //depot/projects/hammer/lib/libalias/libalias.3#6 integrate .. //depot/projects/hammer/lib/libbsnmp/Makefile#2 integrate .. //depot/projects/hammer/lib/libbsnmp/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libbsnmp/libbsnmp/Makefile#2 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_mibII/Makefile#3 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/Makefile#3 integrate .. //depot/projects/hammer/lib/libc/Makefile#12 integrate .. //depot/projects/hammer/lib/libc/alpha/_fpmath.h#3 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/fpgetmask.c#3 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/fpsetmask.c#2 integrate .. //depot/projects/hammer/lib/libc/amd64/_fpmath.h#8 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/amd64_get_fsbase.c#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/amd64_get_gsbase.c#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/amd64_set_fsbase.c#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/amd64_set_gsbase.c#2 integrate .. //depot/projects/hammer/lib/libc/db/mpool/mpool.c#2 integrate .. //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libc/gdtoa/_hdtoa.c#1 branch .. //depot/projects/hammer/lib/libc/gdtoa/_ldtoa.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#10 integrate .. //depot/projects/hammer/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/getpwent.c#9 integrate .. //depot/projects/hammer/lib/libc/gen/pw_scan.c#5 integrate .. //depot/projects/hammer/lib/libc/gen/sem.c#1 branch .. //depot/projects/hammer/lib/libc/gen/sem_destroy.3#1 branch .. //depot/projects/hammer/lib/libc/gen/sem_getvalue.3#1 branch .. //depot/projects/hammer/lib/libc/gen/sem_init.3#1 branch .. //depot/projects/hammer/lib/libc/gen/sem_open.3#1 branch .. //depot/projects/hammer/lib/libc/gen/sem_post.3#1 branch .. //depot/projects/hammer/lib/libc/gen/sem_wait.3#1 branch .. //depot/projects/hammer/lib/libc/i386/_fpmath.h#3 integrate .. //depot/projects/hammer/lib/libc/i386/sys/i386_get_ioperm.c#3 integrate .. //depot/projects/hammer/lib/libc/i386/sys/i386_get_ldt.c#3 integrate .. //depot/projects/hammer/lib/libc/i386/sys/i386_set_ioperm.c#3 integrate .. //depot/projects/hammer/lib/libc/i386/sys/i386_set_ldt.c#3 integrate .. //depot/projects/hammer/lib/libc/i386/sys/i386_vm86.c#3 integrate .. //depot/projects/hammer/lib/libc/ia64/_fpmath.h#3 integrate .. //depot/projects/hammer/lib/libc/include/fpmath.h#2 integrate .. //depot/projects/hammer/lib/libc/net/nss_compat.c#2 integrate .. //depot/projects/hammer/lib/libc/powerpc/_fpmath.h#4 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/syncicache.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/sparc64/_fpmath.h#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#4 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/__sparc_utrap.c#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/__sparc_utrap_install.c#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/__sparc_utrap_setup.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/floatio.h#3 integrate .. //depot/projects/hammer/lib/libc/stdio/printf.3#7 integrate .. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#12 integrate .. //depot/projects/hammer/lib/libc/stdlib/random.c#4 integrate .. //depot/projects/hammer/lib/libc/string/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libc/string/ffs.3#4 integrate .. //depot/projects/hammer/lib/libc/string/ffs.c#3 integrate .. //depot/projects/hammer/lib/libc/string/ffsl.c#1 branch .. //depot/projects/hammer/lib/libc/string/fls.c#1 branch .. //depot/projects/hammer/lib/libc/string/flsl.c#1 branch .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#11 integrate .. //depot/projects/hammer/lib/libc/sys/gettimeofday.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/ptrace.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/sem.c#4 delete .. //depot/projects/hammer/lib/libc/sys/sigwait.2#1 branch .. //depot/projects/hammer/lib/libc_r/Makefile#6 integrate .. //depot/projects/hammer/lib/libc_r/man/Makefile.inc#5 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_attr.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_attr_get_np.3#4 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_attr_setcreatesuspend_np.3#2 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_cancel.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_cleanup_pop.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_cleanup_push.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_cond_broadcast.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_cond_destroy.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_cond_init.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_cond_signal.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_cond_timedwait.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_cond_wait.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_condattr.3#4 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_create.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_detach.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_equal.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_exit.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_getconcurrency.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_getspecific.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_join.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_key_create.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_key_delete.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_kill.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_main_np.3#2 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_multi_np.3#2 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_destroy.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_init.3#4 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_lock.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_trylock.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_unlock.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_mutexattr.3#4 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_mutexattr_getkind_np.3#2 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_once.3#4 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_resume_all_np.3#2 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_resume_np.3#2 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_rwlock_destroy.3#2 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_rwlock_init.3#2 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_rwlock_rdlock.3#2 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_rwlock_unlock.3#2 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_rwlock_wrlock.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_rwlockattr_destroy.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_rwlockattr_getpshared.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_rwlockattr_init.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_rwlockattr_setpshared.3#4 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_schedparam.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_self.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_set_name_np.3#2 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_setspecific.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_sigmask.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_suspend_all_np.3#2 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_suspend_np.3#2 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_switch_add_np.3#2 delete .. //depot/projects/hammer/lib/libc_r/man/pthread_testcancel.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/sem_destroy.3#4 delete .. //depot/projects/hammer/lib/libc_r/man/sem_getvalue.3#5 delete .. //depot/projects/hammer/lib/libc_r/man/sem_init.3#4 delete .. //depot/projects/hammer/lib/libc_r/man/sem_open.3#3 delete .. //depot/projects/hammer/lib/libc_r/man/sem_post.3#4 delete .. //depot/projects/hammer/lib/libc_r/man/sem_wait.3#4 delete .. //depot/projects/hammer/lib/libc_r/man/sigwait.3#4 delete .. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#11 integrate .. //depot/projects/hammer/lib/libio/alpha_sethae.c#2 integrate .. //depot/projects/hammer/lib/libpam/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libpam/libpam/Makefile#9 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_krb5/Makefile#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_ksu/Makefile#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_ssh/Makefile#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.8#3 integrate .. //depot/projects/hammer/lib/libpthread/man/Makefile.inc#4 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_attr.3#4 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_attr_get_np.3#4 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_cancel.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_cleanup_pop.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_cleanup_push.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_broadcast.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_destroy.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_init.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_signal.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_timedwait.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_wait.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_condattr.3#4 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_create.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_detach.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_equal.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_exit.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_getspecific.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_join.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_key_create.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_key_delete.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_kill.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_destroy.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_init.3#4 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_lock.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_trylock.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_unlock.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_mutexattr.3#4 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_once.3#4 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_destroy.3#2 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_init.3#2 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_rdlock.3#2 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_unlock.3#2 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_wrlock.3#4 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_destroy.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_getpshared.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_init.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_setpshared.3#4 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_schedparam.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_self.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_setspecific.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_sigmask.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/pthread_testcancel.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/sem_destroy.3#4 delete .. //depot/projects/hammer/lib/libpthread/man/sem_getvalue.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/sem_init.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/sem_open.3#2 delete .. //depot/projects/hammer/lib/libpthread/man/sem_post.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/sem_wait.3#3 delete .. //depot/projects/hammer/lib/libpthread/man/sigwait.3#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#13 integrate .. //depot/projects/hammer/lib/libsdp/Makefile#2 integrate .. //depot/projects/hammer/lib/libsdp/sdp-int.h#2 integrate .. //depot/projects/hammer/lib/libsdp/sdp.3#2 integrate .. //depot/projects/hammer/lib/libsdp/sdp.h#2 integrate .. //depot/projects/hammer/lib/libsdp/search.c#2 integrate .. //depot/projects/hammer/lib/libsdp/service.c#1 branch .. //depot/projects/hammer/lib/libsdp/session.c#2 integrate .. //depot/projects/hammer/lib/libsdp/util.c#3 integrate .. //depot/projects/hammer/lib/libstand/Makefile#8 integrate .. //depot/projects/hammer/lib/libstand/bzipfs.c#2 integrate .. //depot/projects/hammer/lib/libstand/dosfs.c#2 integrate .. //depot/projects/hammer/lib/libstand/ext2fs.c#2 integrate .. //depot/projects/hammer/lib/libstand/fstat.c#2 integrate .. //depot/projects/hammer/lib/libstand/gzipfs.c#3 integrate .. //depot/projects/hammer/lib/libstand/nfs.c#3 integrate .. //depot/projects/hammer/lib/libstand/nullfs.c#2 integrate .. //depot/projects/hammer/lib/libstand/read.c#2 integrate .. //depot/projects/hammer/lib/libstand/splitfs.c#2 integrate .. //depot/projects/hammer/lib/libstand/stand.h#5 integrate .. //depot/projects/hammer/lib/libstand/ufs.c#3 integrate .. //depot/projects/hammer/lib/libstand/zalloc_malloc.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#15 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#12 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_rwlock.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_spinlock.c#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_suspend_np.c#2 integrate .. //depot/projects/hammer/libexec/Makefile#19 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#11 integrate .. //depot/projects/hammer/release/Makefile#42 integrate .. //depot/projects/hammer/release/Makefile.inc.docports#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#12 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#54 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/early-adopter/article.sgml#7 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#10 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#12 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#6 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#12 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.ent#10 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#15 integrate .. //depot/projects/hammer/release/scripts/proflibs-make.sh#2 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#13 integrate .. //depot/projects/hammer/sbin/Makefile#21 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#9 integrate .. //depot/projects/hammer/sbin/atm/fore_dnld/fore_dnld.c#4 integrate .. //depot/projects/hammer/sbin/bsdlabel/Makefile#9 integrate .. //depot/projects/hammer/sbin/camcontrol/modeedit.c#6 integrate .. //depot/projects/hammer/sbin/devfs/devfs.c#2 integrate .. //depot/projects/hammer/sbin/devfs/rule.c#2 integrate .. //depot/projects/hammer/sbin/dump/dump.8#9 integrate .. //depot/projects/hammer/sbin/fsck_ffs/Makefile#3 integrate .. //depot/projects/hammer/sbin/ifconfig/ifmedia.c#5 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#17 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#10 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.c#9 integrate .. //depot/projects/hammer/sbin/quotacheck/quotacheck.c#7 integrate .. //depot/projects/hammer/sbin/rtsol/Makefile#3 integrate .. //depot/projects/hammer/sbin/sconfig/Makefile#3 integrate .. //depot/projects/hammer/sbin/sconfig/sconfig.8#3 integrate .. //depot/projects/hammer/secure/Makefile#4 integrate .. //depot/projects/hammer/share/Makefile#4 integrate .. //depot/projects/hammer/share/doc/papers/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/Makefile#2 integrate .. //depot/projects/hammer/share/doc/smm/Makefile#2 integrate .. //depot/projects/hammer/share/doc/usd/Makefile#3 integrate .. //depot/projects/hammer/share/examples/bootforth/frames.4th#2 integrate .. //depot/projects/hammer/share/examples/cvsup/cvs-supfile#5 integrate .. //depot/projects/hammer/share/examples/cvsup/ports-supfile#5 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#14 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_cmds.c#4 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_target.h#3 integrate .. //depot/projects/hammer/share/man/man1/Makefile#2 integrate .. //depot/projects/hammer/share/man/man3/Makefile#4 integrate .. //depot/projects/hammer/share/man/man3/pthread.3#4 integrate .. //depot/projects/hammer/share/man/man3/pthread_attr.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_attr_get_np.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_attr_setcreatesuspend_np.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_cancel.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_cleanup_pop.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_cleanup_push.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_cond_broadcast.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_cond_destroy.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_cond_init.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_cond_signal.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_cond_timedwait.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_cond_wait.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_condattr.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_create.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_detach.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_equal.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_exit.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_getconcurrency.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_getspecific.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_join.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_key_create.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_key_delete.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_kill.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_main_np.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_multi_np.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_mutex_destroy.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_mutex_init.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_mutex_lock.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_mutex_timedlock.3#2 integrate .. //depot/projects/hammer/share/man/man3/pthread_mutex_trylock.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_mutex_unlock.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_mutexattr.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_mutexattr_getkind_np.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_once.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_resume_all_np.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_resume_np.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_rwlock_destroy.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_rwlock_init.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_rwlock_rdlock.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_rwlock_timedrdlock.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_rwlock_timedwrlock.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_rwlock_unlock.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_rwlock_wrlock.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_destroy.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_getpshared.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_init.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_setpshared.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_schedparam.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_self.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_set_name_np.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_setspecific.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_sigmask.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_spin_init.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_spin_lock.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_suspend_all_np.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_suspend_np.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_switch_add_np.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_testcancel.3#1 branch .. //depot/projects/hammer/share/man/man4/Makefile#33 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#17 integrate .. //depot/projects/hammer/share/man/man4/aue.4#4 integrate .. //depot/projects/hammer/share/man/man4/awi.4#5 integrate .. //depot/projects/hammer/share/man/man4/crypto.4#4 integrate .. //depot/projects/hammer/share/man/man4/gx.4#3 integrate .. //depot/projects/hammer/share/man/man4/kue.4#4 integrate .. //depot/projects/hammer/share/man/man4/lge.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#13 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/tx.4#3 delete .. //depot/projects/hammer/share/man/man4/miibus.4#6 integrate .. //depot/projects/hammer/share/man/man4/ng_rfc1490.4#2 integrate .. //depot/projects/hammer/share/man/man4/nge.4#2 integrate .. //depot/projects/hammer/share/man/man4/polling.4#5 integrate .. //depot/projects/hammer/share/man/man4/random.4#3 integrate .. //depot/projects/hammer/share/man/man4/re.4#3 integrate .. //depot/projects/hammer/share/man/man4/rue.4#4 integrate .. //depot/projects/hammer/share/man/man4/sk.4#4 integrate .. //depot/projects/hammer/share/man/man4/tdfx.4#2 integrate .. //depot/projects/hammer/share/man/man4/tx.4#1 branch .. //depot/projects/hammer/share/man/man4/uscanner.4#6 integrate .. //depot/projects/hammer/share/man/man5/Makefile#7 integrate .. //depot/projects/hammer/share/man/man5/hosts.lpd.5#2 integrate .. //depot/projects/hammer/share/man/man6/intro.6#2 integrate .. //depot/projects/hammer/share/man/man7/Makefile#6 integrate .. //depot/projects/hammer/share/man/man8/Makefile#6 integrate .. //depot/projects/hammer/share/man/man8/diskless.8#5 integrate .. //depot/projects/hammer/share/man/man8/yp.8#5 integrate .. //depot/projects/hammer/share/man/man9/Makefile#24 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#9 integrate .. //depot/projects/hammer/share/man/man9/mbuf.9#10 integrate .. //depot/projects/hammer/share/man/man9/sbuf.9#4 integrate .. //depot/projects/hammer/share/man/man9/vn_fullpath.9#1 branch .. //depot/projects/hammer/share/misc/bsd-family-tree#11 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#10 integrate .. //depot/projects/hammer/share/mk/bsd.dep.mk#7 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#11 integrate .. //depot/projects/hammer/share/mk/bsd.obj.mk#4 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#10 integrate .. //depot/projects/hammer/share/skel/Makefile#2 integrate .. //depot/projects/hammer/share/syscons/fonts/Makefile#4 integrate .. //depot/projects/hammer/share/syscons/keymaps/Makefile#8 integrate .. //depot/projects/hammer/share/syscons/scrnmaps/Makefile#3 integrate .. //depot/projects/hammer/sys/Makefile#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/support.s#5 integrate .. //depot/projects/hammer/sys/alpha/include/sysarch.h#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#17 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#20 integrate .. //depot/projects/hammer/sys/amd64/include/sysarch.h#10 integrate .. //depot/projects/hammer/sys/boot/forth/beastie.4th#6 integrate .. //depot/projects/hammer/sys/boot/forth/frames.4th#2 integrate .. //depot/projects/hammer/sys/boot/i386/cdboot/cdboot.s#3 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#7 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/vidconsole.c#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#10 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#19 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.c#5 integrate .. //depot/projects/hammer/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/hammer/sys/compat/ndis/pe_var.h#3 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#3 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_pe.c#4 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#10 integrate .. //depot/projects/hammer/sys/conf/files#44 integrate .. //depot/projects/hammer/sys/conf/files.alpha#11 integrate .. //depot/projects/hammer/sys/conf/files.i386#21 integrate .. //depot/projects/hammer/sys/conf/files.ia64#15 integrate .. //depot/projects/hammer/sys/conf/files.pc98#21 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#5 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#14 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#18 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#16 integrate .. //depot/projects/hammer/sys/conf/majors#20 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#9 integrate .. //depot/projects/hammer/sys/conf/options.i386#23 integrate .. //depot/projects/hammer/sys/conf/options.powerpc#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstore.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdTable.c#3 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#20 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#11 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#16 integrate .. //depot/projects/hammer/sys/dev/amd/amd.c#8 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#14 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#19 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#13 integrate .. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#24 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#14 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#12 integrate .. //depot/projects/hammer/sys/dev/ata/ata-isa.c#7 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#15 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#15 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#15 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#14 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#16 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#7 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#8 integrate .. //depot/projects/hammer/sys/dev/awi/am79c930.c#4 integrate .. //depot/projects/hammer/sys/dev/awi/am79c930reg.h#2 integrate .. //depot/projects/hammer/sys/dev/awi/am79c930var.h#2 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#8 integrate .. //depot/projects/hammer/sys/dev/awi/awi_wep.c#6 delete .. //depot/projects/hammer/sys/dev/awi/awi_wicfg.c#4 delete .. //depot/projects/hammer/sys/dev/awi/awireg.h#2 integrate .. //depot/projects/hammer/sys/dev/awi/awivar.h#3 integrate .. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#8 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#27 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#9 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#17 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_scsi.c#10 integrate .. //depot/projects/hammer/sys/dev/fb/fbreg.h#11 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdev.c#9 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#20 integrate .. //depot/projects/hammer/sys/dev/gx/if_gx.c#8 integrate .. //depot/projects/hammer/sys/dev/ida/ida.c#9 integrate .. //depot/projects/hammer/sys/dev/ida/ida_disk.c#6 integrate .. //depot/projects/hammer/sys/dev/ida/ida_eisa.c#6 integrate .. //depot/projects/hammer/sys/dev/ida/ida_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/ida/idaio.h#1 branch .. //depot/projects/hammer/sys/dev/ida/idareg.h#3 integrate .. //depot/projects/hammer/sys/dev/ida/idavar.h#3 integrate .. //depot/projects/hammer/sys/dev/idt/idt.c#6 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/hammer/sys/dev/ips/ips.c#7 integrate .. //depot/projects/hammer/sys/dev/ispfw/asm_12160.h#2 integrate .. //depot/projects/hammer/sys/dev/ispfw/asm_2200.h#3 integrate .. //depot/projects/hammer/sys/dev/ispfw/asm_2300.h#5 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/md/md.c#20 integrate .. //depot/projects/hammer/sys/dev/mii/ukphy.c#5 integrate .. //depot/projects/hammer/sys/dev/mly/mly.c#8 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#20 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#20 integrate .. //depot/projects/hammer/sys/dev/pci/pci_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/pci/pci_user.c#6 integrate .. //depot/projects/hammer/sys/dev/pci/pcib_private.h#4 integrate .. //depot/projects/hammer/sys/dev/pdq/pdqvar.h#4 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpo.c#5 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#26 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/neomagic-coeff.h#3 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.h#3 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/hammer/sys/dev/syscons/scgfbrndr.c#3 integrate .. //depot/projects/hammer/sys/dev/syscons/schistory.c#5 integrate .. //depot/projects/hammer/sys/dev/syscons/scterm-dumb.c#3 integrate .. //depot/projects/hammer/sys/dev/syscons/scterm-sc.c#3 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#12 integrate .. //depot/projects/hammer/sys/dev/trm/trm.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/uhci.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#24 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#23 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#23 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_rule.c#4 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#7 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_smb.c#6 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#12 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#9 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#21 integrate .. //depot/projects/hammer/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 integrate .. //depot/projects/hammer/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate .. //depot/projects/hammer/sys/gnu/dev/sound/pci/emu10k1.h#3 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_toshiba.c#1 branch .. //depot/projects/hammer/sys/i386/conf/NOTES#27 integrate .. //depot/projects/hammer/sys/i386/i386/p4tcc.c#1 branch .. //depot/projects/hammer/sys/i386/i386/pmap.c#27 integrate .. //depot/projects/hammer/sys/i386/i386/swtch.s#8 integrate .. //depot/projects/hammer/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/hammer/sys/i386/include/sysarch.h#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#13 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#22 integrate .. //depot/projects/hammer/sys/ia64/include/cpufunc.h#7 integrate .. //depot/projects/hammer/sys/ia64/include/sysarch.h#3 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#9 integrate .. //depot/projects/hammer/sys/kern/init_main.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_tc.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_uuid.c#6 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#11 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#17 integrate .. //depot/projects/hammer/sys/kern/uipc_cow.c#10 integrate .. //depot/projects/hammer/sys/kern/uipc_sem.c#6 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#16 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#15 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#20 integrate .. //depot/projects/hammer/sys/libkern/ffs.c#4 integrate .. //depot/projects/hammer/sys/libkern/ffsl.c#1 branch .. //depot/projects/hammer/sys/libkern/fls.c#1 branch .. //depot/projects/hammer/sys/libkern/flsl.c#1 branch .. //depot/projects/hammer/sys/modules/Makefile#34 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#12 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile.inc#1 branch .. //depot/projects/hammer/sys/modules/acpi/acpi_toshiba/Makefile#1 branch .. //depot/projects/hammer/sys/modules/awi/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/cx/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/drm/mga/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/drm/r128/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/drm/radeon/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/drm/sis/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/drm/tdfx/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/firewire/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/ida/Makefile#1 branch .. //depot/projects/hammer/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ncp/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ndis/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/netgraph/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bluetooth/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bt3c/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/h4/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/hci/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/l2cap/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/socket/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubt/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/netgraph/fec/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/nwfs/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/smbfs/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/sound/driver/emu10k1/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/syscons/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ubsa/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ucom/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/udf/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ufm/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/uftdi/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/umct/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/uplcom/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/uvisor/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/uvscom/Makefile#3 integrate .. //depot/projects/hammer/sys/net/if_atmsubr.c#13 integrate .. //depot/projects/hammer/sys/net/if_media.h#7 integrate .. //depot/projects/hammer/sys/net/if_ppp.c#11 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#8 integrate .. //depot/projects/hammer/sys/net/if_vlan_var.h#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_cisco.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_rfc1490.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_rfc1490.h#3 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#18 integrate .. //depot/projects/hammer/sys/netinet/tcp.h#4 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#21 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#11 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#11 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#7 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#7 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#11 integrate .. //depot/projects/hammer/sys/netinet6/ipsec.c#9 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.h#5 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_output.c#7 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/hammer/sys/netkey/key.c#14 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#16 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#25 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#15 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#27 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#19 integrate .. //depot/projects/hammer/sys/pci/ncr.c#9 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#12 integrate .. //depot/projects/hammer/sys/powerpc/include/float.h#3 integrate .. //depot/projects/hammer/sys/powerpc/include/nexusvar.h#2 integrate .. //depot/projects/hammer/sys/powerpc/include/openpicvar.h#3 integrate .. //depot/projects/hammer/sys/powerpc/include/sc_machdep.h#1 branch .. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.c#1 branch .. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.h#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/ata_macio.c#6 integrate .. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powermac/openpic_macio.c#1 branch .. //depot/projects/hammer/sys/powerpc/powerpc/clock.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#23 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/nexus.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/openpic.c#7 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/sc_machdep.c#1 branch .. //depot/projects/hammer/sys/powerpc/powerpc/trap_subr.S#4 integrate .. //depot/projects/hammer/sys/powerpc/psim/ata_iobus.c#5 integrate .. //depot/projects/hammer/sys/powerpc/psim/openpic_iobus.c#1 branch .. //depot/projects/hammer/sys/rpc/rpcclnt.c#4 integrate .. //depot/projects/hammer/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/hammer/sys/sparc64/include/sysarch.h#2 integrate .. //depot/projects/hammer/sys/sys/filedesc.h#6 integrate .. //depot/projects/hammer/sys/sys/libkern.h#5 integrate .. //depot/projects/hammer/sys/sys/proc.h#42 integrate .. //depot/projects/hammer/sys/sys/systm.h#14 integrate .. //depot/projects/hammer/sys/sys/user.h#8 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#17 integrate .. //depot/projects/hammer/sys/vm/uma_int.h#9 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#12 integrate .. //depot/projects/hammer/sys/vm/vm_extern.h#7 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#13 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#34 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.c#5 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-scanfloat.c#2 integrate .. //depot/projects/hammer/tools/tools/crypto/Makefile#5 integrate .. //depot/projects/hammer/tools/tools/crypto/cryptotest.c#3 delete .. //depot/projects/hammer/tools/tools/tinderbox/www/Makefile#4 integrate .. //depot/projects/hammer/tools/tools/tinderbox/www/daemon.png#2 delete .. //depot/projects/hammer/tools/tools/tinderbox/www/daemon.png.uu#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/www/valid-css.png#2 delete .. //depot/projects/hammer/tools/tools/tinderbox/www/valid-css.png.uu#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/www/valid-xhtml10.png#2 delete .. //depot/projects/hammer/tools/tools/tinderbox/www/valid-xhtml10.png.uu#1 branch .. //depot/projects/hammer/usr.bin/Makefile#23 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#14 integrate .. //depot/projects/hammer/usr.bin/chkey/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/chpass/chpass.c#5 integrate .. //depot/projects/hammer/usr.bin/chpass/chpass.h#2 integrate .. //depot/projects/hammer/usr.bin/chpass/field.c#3 integrate .. //depot/projects/hammer/usr.bin/chpass/util.c#2 integrate .. //depot/projects/hammer/usr.bin/find/ls.c#3 integrate .. //depot/projects/hammer/usr.bin/killall/killall.1#3 integrate .. //depot/projects/hammer/usr.bin/killall/killall.c#7 integrate .. //depot/projects/hammer/usr.bin/locale/locale.c#5 integrate .. //depot/projects/hammer/usr.bin/lock/lock.c#5 integrate .. //depot/projects/hammer/usr.bin/make/make.1#8 integrate .. //depot/projects/hammer/usr.bin/make/str.c#5 integrate .. //depot/projects/hammer/usr.bin/make/var.c#10 integrate .. //depot/projects/hammer/usr.bin/newkey/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/script/script.1#3 integrate .. //depot/projects/hammer/usr.bin/script/script.c#3 integrate .. //depot/projects/hammer/usr.bin/uac/uac.c#2 integrate .. //depot/projects/hammer/usr.bin/uuencode/uuencode.c#4 integrate .. //depot/projects/hammer/usr.sbin/Makefile#39 integrate .. //depot/projects/hammer/usr.sbin/acpi/iasl/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/apm/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/apm/apm.8#6 integrate .. //depot/projects/hammer/usr.sbin/apmd/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/apmd/apmd.8#5 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpcontrol/search.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/bgd.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/dun.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/ftrn.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/irmc.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/irmc_command.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/lan.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/log.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/log.h#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/main.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/opush.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/profile.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/profile.h#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/provider.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/provider.h#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sar.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/scr.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sd.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sdpd.8#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/server.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/server.h#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sp.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/srr.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/ssar.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/ssr.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sur.c#1 branch .. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.5#3 integrate .. //depot/projects/hammer/usr.sbin/edquota/edquota.c#4 integrate .. //depot/projects/hammer/usr.sbin/faithd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/getfmac/getfmac.c#2 integrate .. //depot/projects/hammer/usr.sbin/getpmac/getpmac.c#2 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdnd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdnmonitor/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/keyserv/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/mailwrapper/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/mixer/mixer.c#6 integrate .. //depot/projects/hammer/usr.sbin/moused/moused.c#6 integrate .. //depot/projects/hammer/usr.sbin/mtree/compare.c#8 integrate .. //depot/projects/hammer/usr.sbin/mtree/create.c#8 integrate .. //depot/projects/hammer/usr.sbin/mtree/extern.h#5 integrate .. //depot/projects/hammer/usr.sbin/mtree/misc.c#4 integrate .. //depot/projects/hammer/usr.sbin/mtree/mtree.8#6 integrate .. //depot/projects/hammer/usr.sbin/mtree/mtree.c#6 integrate .. //depot/projects/hammer/usr.sbin/mtree/verify.c#6 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/inf-token.l#3 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/inf.c#3 integrate .. //depot/projects/hammer/usr.sbin/nfsd/nfsd.c#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/dot.c#1 branch .. //depot/projects/hammer/usr.sbin/ngctl/main.c#4 integrate .. //depot/projects/hammer/usr.sbin/ngctl/ngctl.8#3 integrate .. //depot/projects/hammer/usr.sbin/ngctl/ngctl.h#2 integrate .. //depot/projects/hammer/usr.sbin/ofwdump/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ofwdump/ofwdump.8#3 integrate .. //depot/projects/hammer/usr.sbin/pccard/pccardd/pccardd.8#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/Makefile.inc#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/delete/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/sign/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ppp/arp.c#2 integrate .. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#7 integrate .. //depot/projects/hammer/usr.sbin/pw/pw.8#4 integrate .. //depot/projects/hammer/usr.sbin/pw/pw.c#2 integrate .. //depot/projects/hammer/usr.sbin/pw/pw_group.c#2 integrate .. //depot/projects/hammer/usr.sbin/pw/pw_user.c#3 integrate .. //depot/projects/hammer/usr.sbin/quotaon/quotaon.c#3 integrate .. //depot/projects/hammer/usr.sbin/repquota/repquota.c#4 integrate .. //depot/projects/hammer/usr.sbin/rtsold/dump.c#3 integrate .. //depot/projects/hammer/usr.sbin/rtsold/if.c#3 integrate .. //depot/projects/hammer/usr.sbin/rtsold/probe.c#3 integrate .. //depot/projects/hammer/usr.sbin/rtsold/rtsock.c#3 integrate .. //depot/projects/hammer/usr.sbin/rtsold/rtsol.c#3 integrate .. //depot/projects/hammer/usr.sbin/rtsold/rtsold.8#4 integrate .. //depot/projects/hammer/usr.sbin/rtsold/rtsold.c#3 integrate .. //depot/projects/hammer/usr.sbin/rtsold/rtsold.h#3 integrate .. //depot/projects/hammer/usr.sbin/sa/main.c#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/user.c#2 integrate .. //depot/projects/hammer/usr.sbin/watch/watch.c#5 integrate .. //depot/projects/hammer/usr.sbin/wlconfig/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/wlconfig/wlconfig.8#2 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#35 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.398 2003/12/09 00:42:44 gad Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.402 2004/01/22 08:18:36 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -93,7 +93,7 @@ SUBDIR+= usr.sbin .endif -# etc must be last for "distribute" to work +# etc must be last for install/distribute to work .if exists(${.CURDIR}/etc) SUBDIR+= etc .endif @@ -272,7 +272,7 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/sys usr/lib \ + usr/bin usr/games usr/include/c++/3.3 usr/include/sys usr/lib \ usr/libexec usr/sbin usr/share/dict \ usr/share/groff_font/devX100 \ usr/share/groff_font/devX100-12 \ @@ -348,8 +348,9 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 4.2: building libraries" @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG -DNOLINT \ - libraries + cd ${.CURDIR}; \ + ${WMAKE} -DNOFSCHG -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPROFILE \ + libraries _depend: @echo @echo "--------------------------------------------------------------" @@ -431,13 +432,6 @@ @echo ">>> Installing everything.." @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if !defined(NOMAN) && !defined(NO_MAKEDB_RUN) - @echo - @echo "--------------------------------------------------------------" - @echo ">>> Rebuilding man page indices" - @echo "--------------------------------------------------------------" - cd ${.CURDIR}/share/man; ${MAKE} makedb -.endif redistribute: @echo "--------------------------------------------------------------" @@ -629,6 +623,10 @@ .endif .endif +.if ${BOOTSTRAPPING} < 502102 +_lex= usr.bin/lex +.endif + .if ${BOOTSTRAPPING} < 450005 || \ ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034 _uudecode= usr.bin/uudecode @@ -660,6 +658,7 @@ ${_groff} \ gnu/usr.bin/texinfo \ usr.bin/colldef \ + ${_lex} \ usr.bin/makewhatis \ usr.bin/rpcgen \ ${_uudecode} \ ==== //depot/projects/hammer/bin/Makefile#3 (text+ko) ==== @@ -1,11 +1,12 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.23 2003/02/18 19:51:58 obrien Exp $ +# $FreeBSD: src/bin/Makefile,v 1.24 2004/01/16 15:23:18 ru Exp $ SUBDIR= cat \ chflags \ chio \ chmod \ cp \ + ${_csh} \ date \ dd \ df \ @@ -24,8 +25,10 @@ pax \ ps \ pwd \ + ${_rcp} \ realpath \ rm \ + ${_rmail} \ rmdir \ setfacl \ sh \ @@ -35,15 +38,15 @@ test .if !defined(NO_RCMNDS) -SUBDIR+=rcp +_rcp= rcp .endif -.if !defined(NO_TCSH) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 22 17:51:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9805916A4D0; Thu, 22 Jan 2004 17:51:30 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 53CF916A4CE for ; Thu, 22 Jan 2004 17:51:30 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91B5343D41 for ; Thu, 22 Jan 2004 17:50:49 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0N1on0B003958 for ; Thu, 22 Jan 2004 17:50:49 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0N1omBE003954 for perforce@freebsd.org; Thu, 22 Jan 2004 17:50:48 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 22 Jan 2004 17:50:48 -0800 (PST) Message-Id: <200401230150.i0N1omBE003954@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 45757 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jan 2004 01:51:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=45757 Change 45757 by peter@peter_daintree on 2004/01/22 17:50:30 integrate -I -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#29 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#78 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#52 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#52 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#26 integrate .. //depot/projects/hammer/sys/amd64/include/cpu.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#21 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/sysarch.h#11 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#33 integrate .. //depot/projects/hammer/sys/amd64/isa/icu.h#17 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#10 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#18 (text+ko) ==== @@ -294,7 +294,9 @@ pushq %r13 pushq %r14 pushq %r15 - pushq $sw0_1 + movq $0,%rdi + movq $0,%rsi + leaq sw0_1,%rdx call __panic sw0_1: .asciz "cpu_throw: no newthread supplied" @@ -314,7 +316,9 @@ pushq %r13 pushq %r14 pushq %r15 - pushq $sw0_2 + movq $0,%rdi + movq $0,%rsi + leaq sw0_2,%rdx call __panic sw0_2: .asciz "cpu_switch: no curthread supplied" @@ -334,7 +338,9 @@ pushq %r13 pushq %r14 pushq %r15 - pushq $sw0_3 + movq $0,%rdi + movq $0,%rsi + leaq sw0_3,%rdx call __panic sw0_3: .asciz "cpu_switch: no newthread supplied" #endif ==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#13 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#29 (text+ko) ==== @@ -605,6 +605,10 @@ if (retval != 0) printf("%s: Failed to setup the local APIC: returned %d\n", best_enum->apic_name, retval); +#ifdef SMP + /* Last, setup the cpu topology now that we have probed CPUs */ + mp_topology(); +#endif } SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL) ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#78 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#52 (text+ko) ==== @@ -78,10 +78,10 @@ extern int nkpt; /* - * CPU topology map datastructures for HTT. (XXX) + * CPU topology map datastructures for HTT. */ -struct cpu_group mp_groups[MAXCPU]; -struct cpu_top mp_top; +static struct cpu_group mp_groups[MAXCPU]; +static struct cpu_top mp_top; struct cpu_top *smp_topology; /* AP uses this during bootstrap. Do not staticize. */ @@ -142,6 +142,46 @@ static struct sysctl_ctx_list logical_cpu_clist; static u_int bootMP_size; +void +mp_topology(void) +{ + struct cpu_group *group; + int logical_cpus; + int apic_id; + int groups; + int cpu; + + /* Build the smp_topology map. */ + /* Nothing to do if there is no HTT support. */ + if ((cpu_feature & CPUID_HTT) == 0) + return; + logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16; + if (logical_cpus <= 1) + return; + group = &mp_groups[0]; + groups = 1; + for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { + if (!cpu_info[apic_id].cpu_present) + continue; + /* + * If the current group has members and we're not a logical + * cpu, create a new group. + */ + if (group->cg_count != 0 && (apic_id % logical_cpus) == 0) { + group++; + groups++; + } + group->cg_count++; + group->cg_mask |= 1 << cpu; + cpu++; + } + + mp_top.ct_count = groups; + mp_top.ct_group = mp_groups; + smp_topology = &mp_top; +} + + /* * Calculate usable address in base memory for AP trampoline code. */ ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#52 (text+ko) ==== @@ -1420,6 +1420,7 @@ m = PHYS_TO_VM_PAGE(pmap->pm_pml4[PML4PML4I]); m->wire_count--; atomic_subtract_int(&cnt.v_wire_count, 1); + /* XXX check if we can vm_page_free_zero here! */ vm_page_free(m); vm_page_unlock_queues(); } ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#26 (text+ko) ==== @@ -45,38 +45,38 @@ #include "opt_isa.h" #include "opt_kstack_pages.h" +#include "opt_cpu.h" #include #include -#include -#include -#include #include #include -#include -#include +#include #include #include +#include +#include #include #include +#include +#include #include -#include #include #include +#include +#include +#include #include #include #include #include -#include -#include +#include #include #include #include -#include - -#include +#include #include ==== //depot/projects/hammer/sys/amd64/include/cpu.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/md_var.h#21 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/profile.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/smp.h#15 (text+ko) ==== @@ -60,6 +60,7 @@ void forwarded_hardclock(struct clockframe frame); u_int mp_bootaddress(u_int); int mp_grab_cpu_hlt(void); +void mp_topology(void); void smp_invlpg(vm_offset_t addr); void smp_masked_invlpg(u_int mask, vm_offset_t addr); void smp_invlpg_range(vm_offset_t startva, vm_offset_t endva); ==== //depot/projects/hammer/sys/amd64/include/specialreg.h#11 (text+ko) ==== @@ -159,6 +159,9 @@ #define MSR_MCG_CTL 0x17b #define MSR_EVNTSEL0 0x186 #define MSR_EVNTSEL1 0x187 +#define MSR_THERM_CONTROL 0x19a +#define MSR_THERM_INTERRUPT 0x19b +#define MSR_THERM_STATUS 0x19c #define MSR_DEBUGCTLMSR 0x1d9 #define MSR_LASTBRANCHFROMIP 0x1db #define MSR_LASTBRANCHTOIP 0x1dc ==== //depot/projects/hammer/sys/amd64/include/sysarch.h#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#33 (text+ko) ==== @@ -62,15 +62,23 @@ #define MASTER 0 #define SLAVE 1 +/* + * Determine the base master and slave modes not including auto EOI support. + * All machines that FreeBSD supports use 8086 mode. + */ +#define BASE_MASTER_MODE ICW4_8086 +#define BASE_SLAVE_MODE ICW4_8086 + +/* Enable automatic EOI if requested. */ #ifdef AUTO_EOI_1 -#define MASTER_MODE (ICW4_8086 | ICW4_AEOI) +#define MASTER_MODE (BASE_MASTER_MODE | ICW4_AEOI) #else -#define MASTER_MODE ICW4_8086 +#define MASTER_MODE BASE_MASTER_MODE #endif #ifdef AUTO_EOI_2 -#define SLAVE_MODE (ICW4_8086 | ICW4_AEOI) +#define SLAVE_MODE (BASE_SLAVE_MODE | ICW4_AEOI) #else -#define SLAVE_MODE ICW4_8086 +#define SLAVE_MODE BASE_SLAVE_MODE #endif static void atpic_init(void *dummy); ==== //depot/projects/hammer/sys/amd64/isa/icu.h#17 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#10 (text+ko) ==== @@ -286,7 +286,7 @@ devmax = 32; outl(CONF1_ADDR_PORT, CONF1_ENABLE_CHK); - outb(CONF1_ADDR_PORT + 3, 0); + DELAY(1); mode1res = inl(CONF1_ADDR_PORT); outl(CONF1_ADDR_PORT, oldval1); From owner-p4-projects@FreeBSD.ORG Fri Jan 23 11:26:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61E6E16A4F1; Fri, 23 Jan 2004 11:26:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2399916A4D3 for ; Fri, 23 Jan 2004 11:26:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 044BF43D53 for ; Fri, 23 Jan 2004 11:26:20 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0NJQJ0B077350 for ; Fri, 23 Jan 2004 11:26:19 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0NJQJY6077347 for perforce@freebsd.org; Fri, 23 Jan 2004 11:26:19 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 23 Jan 2004 11:26:19 -0800 (PST) Message-Id: <200401231926.i0NJQJY6077347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 45800 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jan 2004 19:26:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=45800 Change 45800 by rwatson@rwatson_tislabs on 2004/01/23 11:25:47 Change / to \ in nvram instructions. Put the string in quotes to protect the \. Submitted by: mike halderman Affected files ... .. //depot/projects/trustedbsd/sedarwin/bootstrap_instructions.txt#23 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/bootstrap_instructions.txt#23 (text+ko) ==== @@ -231,7 +231,7 @@ boot-device mac-io/ata-4@1f000/@0:5,\\:tbxi auto-boot? true boot-screen - % sudo nvram boot-file=mac-io/ata-4@1f000/@0:5,/mach_kernel.sedarwin + % sudo nvram "boot-file=mac-io/ata-4@1f000/@0:5,\mach_kernel.sedarwin" Note that the boot-file variable consists if {bootdevice},{filename}, and that the bootdevice is extracted from the more confusing From owner-p4-projects@FreeBSD.ORG Fri Jan 23 15:17:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EEE216A4D0; Fri, 23 Jan 2004 15:17:12 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7777216A4CE for ; Fri, 23 Jan 2004 15:17:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3116343D5A for ; Fri, 23 Jan 2004 15:15:16 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0NNFG0B036564 for ; Fri, 23 Jan 2004 15:15:16 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0NNFEcp036561 for perforce@freebsd.org; Fri, 23 Jan 2004 15:15:14 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 23 Jan 2004 15:15:14 -0800 (PST) Message-Id: <200401232315.i0NNFEcp036561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 45817 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jan 2004 23:17:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=45817 Change 45817 by sam@sam_ebb on 2004/01/23 15:15:05 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#17 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#6 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211.h#6 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_compat.c#2 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_compat.h#3 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_crypto.c#3 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_crypto.h#3 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_input.c#5 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#9 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.h#3 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_node.c#3 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_node.h#3 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#6 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_proto.c#4 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_proto.h#3 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_radiotap.h#4 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_var.h#6 edit .. //depot/projects/netperf/sys/alpha/alpha/support.s#3 integrate .. //depot/projects/netperf/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#12 integrate .. //depot/projects/netperf/sys/compat/ndis/ndis_var.h#11 integrate .. //depot/projects/netperf/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#13 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ntoskrnl.c#10 integrate .. //depot/projects/netperf/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/netperf/sys/conf/files.i386#11 integrate .. //depot/projects/netperf/sys/conf/files.pc98#9 integrate .. //depot/projects/netperf/sys/conf/files.powerpc#3 integrate .. //depot/projects/netperf/sys/conf/kern.post.mk#9 integrate .. //depot/projects/netperf/sys/conf/kern.pre.mk#8 integrate .. //depot/projects/netperf/sys/conf/options.i386#11 integrate .. //depot/projects/netperf/sys/conf/options.powerpc#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_pci_link.c#8 integrate .. //depot/projects/netperf/sys/dev/amd/amd.c#5 integrate .. //depot/projects/netperf/sys/dev/ata/ata-all.c#13 integrate .. //depot/projects/netperf/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/netperf/sys/dev/ata/ata-chipset.c#18 integrate .. //depot/projects/netperf/sys/dev/ata/ata-disk.c#9 integrate .. //depot/projects/netperf/sys/dev/ata/ata-pci.h#10 integrate .. //depot/projects/netperf/sys/dev/ata/ata-queue.c#10 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cd.c#18 integrate .. //depot/projects/netperf/sys/dev/fb/fbreg.h#4 integrate .. //depot/projects/netperf/sys/dev/firewire/fwdev.c#6 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohci.c#11 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohci_pci.c#8 integrate .. //depot/projects/netperf/sys/dev/firewire/sbp_targ.c#5 integrate .. //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#12 integrate .. //depot/projects/netperf/sys/dev/if_ndis/if_ndisvar.h#6 integrate .. //depot/projects/netperf/sys/dev/lnc/if_lnc_pci.c#5 integrate .. //depot/projects/netperf/sys/dev/pccard/pccarddevs#11 integrate .. //depot/projects/netperf/sys/dev/pccard/pccarddevs.h#11 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/ac97.c#8 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/dsp.h#3 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/sound.c#6 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/netperf/sys/dev/syscons/scgfbrndr.c#4 integrate .. //depot/projects/netperf/sys/dev/syscons/schistory.c#3 integrate .. //depot/projects/netperf/sys/dev/syscons/scterm-dumb.c#3 integrate .. //depot/projects/netperf/sys/dev/syscons/scterm-sc.c#3 integrate .. //depot/projects/netperf/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/netperf/sys/dev/usb/umass.c#9 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs.h#15 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs_data.h#15 integrate .. //depot/projects/netperf/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/netperf/sys/geom/bde/g_bde_crypt.c#3 integrate .. //depot/projects/netperf/sys/geom/geom_dev.c#8 integrate .. //depot/projects/netperf/sys/geom/geom_disk.c#7 integrate .. //depot/projects/netperf/sys/geom/geom_event.c#6 integrate .. //depot/projects/netperf/sys/geom/geom_subr.c#6 integrate .. //depot/projects/netperf/sys/gnu/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/netperf/sys/i386/conf/NOTES#15 integrate .. //depot/projects/netperf/sys/i386/i386/p4tcc.c#1 branch .. //depot/projects/netperf/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/netperf/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/netperf/sys/ia64/ia64/interrupt.c#7 integrate .. //depot/projects/netperf/sys/ia64/ia64/trap.c#11 integrate .. //depot/projects/netperf/sys/isofs/cd9660/cd9660_vnops.c#4 integrate .. //depot/projects/netperf/sys/kern/kern_exit.c#3 integrate .. //depot/projects/netperf/sys/kern/kern_fork.c#9 integrate .. //depot/projects/netperf/sys/kern/kern_jail.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/netperf/sys/kern/kern_prot.c#6 integrate .. //depot/projects/netperf/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/netperf/sys/kern/kern_tc.c#6 integrate .. //depot/projects/netperf/sys/kern/kern_thread.c#12 integrate .. //depot/projects/netperf/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/netperf/sys/kern/sys_generic.c#5 integrate .. //depot/projects/netperf/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/netperf/sys/kern/uipc_syscalls.c#13 integrate .. //depot/projects/netperf/sys/modules/firewire/Makefile#3 integrate .. //depot/projects/netperf/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/ncp/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/nwfs/Makefile#3 integrate .. //depot/projects/netperf/sys/modules/smbfs/Makefile#3 integrate .. //depot/projects/netperf/sys/modules/syscons/Makefile#2 integrate .. //depot/projects/netperf/sys/net/if.c#13 integrate .. //depot/projects/netperf/sys/net/if_media.h#5 integrate .. //depot/projects/netperf/sys/net/if_ppp.c#9 integrate .. //depot/projects/netperf/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/netperf/sys/net/if_vlan_var.h#3 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_ioctl.c#13 integrate .. //depot/projects/netperf/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/netperf/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/netperf/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/netperf/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/netperf/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/netperf/sys/netipsec/ipsec.h#8 integrate .. //depot/projects/netperf/sys/netipsec/ipsec_output.c#8 integrate .. //depot/projects/netperf/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/netperf/sys/pc98/conf/NOTES#12 integrate .. //depot/projects/netperf/sys/pc98/pc98/sio.c#8 integrate .. //depot/projects/netperf/sys/pci/if_rl.c#18 integrate .. //depot/projects/netperf/sys/pci/if_sk.c#12 integrate .. //depot/projects/netperf/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/netperf/sys/powerpc/include/float.h#2 integrate .. //depot/projects/netperf/sys/powerpc/include/sc_machdep.h#1 branch .. //depot/projects/netperf/sys/powerpc/ofw/ofw_syscons.c#1 branch .. //depot/projects/netperf/sys/powerpc/ofw/ofw_syscons.h#1 branch .. //depot/projects/netperf/sys/powerpc/powerpc/clock.c#3 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/machdep.c#7 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/sc_machdep.c#1 branch .. //depot/projects/netperf/sys/powerpc/powerpc/trap_subr.S#2 integrate .. //depot/projects/netperf/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/netperf/sys/sys/_task.h#1 branch .. //depot/projects/netperf/sys/sys/jail.h#2 integrate .. //depot/projects/netperf/sys/sys/proc.h#17 integrate .. //depot/projects/netperf/sys/sys/systm.h#6 integrate .. //depot/projects/netperf/sys/sys/taskqueue.h#5 integrate .. //depot/projects/netperf/sys/sys/user.h#2 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_vnops.c#5 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#17 (text+ko) ==== @@ -338,7 +338,9 @@ | IEEE80211_C_HOSTAP /* hostap mode */ | IEEE80211_C_MONITOR /* monitor mode */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ - | IEEE80211_C_RCVMGT; /* recv management frames */ + | IEEE80211_C_RCVMGT /* recv management frames */ + ; + ic->ic_flags |= IEEE80211_F_DATAPAD; /* get mac address from hardware */ ath_hal_getmac(ah, ic->ic_myaddr); @@ -389,13 +391,12 @@ ath_stop(ifp); bpfdetach(ifp); + ATH_TXBUF_LOCK_DESTROY(sc); + ATH_TXQ_LOCK_DESTROY(sc); ath_desc_free(sc); ath_hal_detach(sc->sc_ah); ieee80211_ifdetach(ifp); - ATH_TXBUF_LOCK_DESTROY(sc); - ATH_TXQ_LOCK_DESTROY(sc); - return 0; } @@ -598,8 +599,7 @@ * in the frame output path; there's nothing to do * here except setup the interrupt mask. */ - if (ic->ic_flags & IEEE80211_F_WEPON) - ath_initkeytable(sc); + ath_initkeytable(sc); if (ath_startrecv(sc) != 0) { if_printf(ifp, "unable to start recv logic\n"); goto done; @@ -1086,17 +1086,13 @@ ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_node *ni) { struct ieee80211com *ic = &sc->sc_ic; - struct ifnet *ifp = &ic->ic_if; struct ath_hal *ah = sc->sc_ah; - struct ieee80211_frame *wh; + struct ath_node *an = ATH_NODE(ni); struct ath_buf *bf; struct ath_desc *ds; struct mbuf *m; - int error, pktlen; - u_int8_t *frm, rate; - u_int16_t capinfo; - struct ieee80211_rateset *rs; - const HAL_RATE_TABLE *rt; + int error; + u_int8_t rate; bf = sc->sc_bcbuf; if (bf->bf_m != NULL) { @@ -1110,88 +1106,13 @@ * we assume the mbuf routines will return us something * with this alignment (perhaps should assert). */ - rs = &ni->ni_rates; - pktlen = sizeof (struct ieee80211_frame) - + 8 + 2 + 2 + 2+ni->ni_esslen + 2+rs->rs_nrates + 3 + 6; - if (rs->rs_nrates > IEEE80211_RATE_SIZE) - pktlen += 2; - if (pktlen <= MHLEN) - MGETHDR(m, M_DONTWAIT, MT_DATA); - else - m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + m = ieee80211_beacon_alloc(ic, ni); if (m == NULL) { - DPRINTF(ATH_DEBUG_BEACON, - ("%s: cannot get mbuf/cluster; size %u\n", - __func__, pktlen)); + DPRINTF(ATH_DEBUG_BEACON, ("%s: cannot get mbuf/cluster\n", + __func__)); sc->sc_stats.ast_be_nombuf++; return ENOMEM; } - - wh = mtod(m, struct ieee80211_frame *); - wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_MGT | - IEEE80211_FC0_SUBTYPE_BEACON; - wh->i_fc[1] = IEEE80211_FC1_DIR_NODS; - *(u_int16_t *)wh->i_dur = 0; - memcpy(wh->i_addr1, ifp->if_broadcastaddr, IEEE80211_ADDR_LEN); - memcpy(wh->i_addr2, ic->ic_myaddr, IEEE80211_ADDR_LEN); - memcpy(wh->i_addr3, ni->ni_bssid, IEEE80211_ADDR_LEN); - *(u_int16_t *)wh->i_seq = 0; - - /* - * beacon frame format - * [8] time stamp - * [2] beacon interval - * [2] cabability information - * [tlv] ssid - * [tlv] supported rates - * [tlv] parameter set (IBSS) - * [tlv] extended supported rates - */ - frm = (u_int8_t *)&wh[1]; - memset(frm, 0, 8); /* timestamp is set by hardware */ - frm += 8; - *(u_int16_t *)frm = htole16(ni->ni_intval); - frm += 2; - if (ic->ic_opmode == IEEE80211_M_IBSS) - capinfo = IEEE80211_CAPINFO_IBSS; - else - capinfo = IEEE80211_CAPINFO_ESS; - if (ic->ic_flags & IEEE80211_F_WEPON) - capinfo |= IEEE80211_CAPINFO_PRIVACY; - if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && - IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) - capinfo |= IEEE80211_CAPINFO_SHORT_PREAMBLE; - if (ic->ic_flags & IEEE80211_F_SHSLOT) - capinfo |= IEEE80211_CAPINFO_SHORT_SLOTTIME; - *(u_int16_t *)frm = htole16(capinfo); - frm += 2; - *frm++ = IEEE80211_ELEMID_SSID; - *frm++ = ni->ni_esslen; - memcpy(frm, ni->ni_essid, ni->ni_esslen); - frm += ni->ni_esslen; - frm = ieee80211_add_rates(frm, rs); - *frm++ = IEEE80211_ELEMID_DSPARMS; - *frm++ = 1; - *frm++ = ieee80211_chan2ieee(ic, ni->ni_chan); - if (ic->ic_opmode == IEEE80211_M_IBSS) { - *frm++ = IEEE80211_ELEMID_IBSSPARMS; - *frm++ = 2; - *frm++ = 0; *frm++ = 0; /* TODO: ATIM window */ - } else { - /* TODO: TIM */ - *frm++ = IEEE80211_ELEMID_TIM; - *frm++ = 4; /* length */ - *frm++ = 0; /* DTIM count */ - *frm++ = 1; /* DTIM period */ - *frm++ = 0; /* bitmap control */ - *frm++ = 0; /* Partial Virtual Bitmap (variable length) */ - } - frm = ieee80211_add_xrates(frm, rs); - m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *); - KASSERT(m->m_pkthdr.len <= pktlen, - ("beacon bigger than expected, len %u calculated %u", - m->m_pkthdr.len, pktlen)); - DPRINTF(ATH_DEBUG_BEACON, ("%s: m %p len %u\n", __func__, m, m->m_len)); error = bus_dmamap_load_mbuf(sc->sc_dmat, bf->bf_dmamap, m, ath_mbuf_load_cb, bf, @@ -1213,12 +1134,10 @@ * Calculate rate code. * XXX everything at min xmit rate */ - rt = sc->sc_currates; - KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); if (ic->ic_flags & IEEE80211_F_SHPREAMBLE) - rate = rt->info[0].rateCode | rt->info[0].shortPreamble; + rate = an->an_tx_mgtratesp; else - rate = rt->info[0].rateCode; + rate = an->an_tx_mgtrate; ath_hal_setuptxdesc(ah, ds , m->m_pkthdr.len + IEEE80211_CRC_LEN /* packet length */ , sizeof(struct ieee80211_frame) /* header length */ @@ -1999,9 +1918,9 @@ rix = 0; /* XXX lowest rate */ try0 = ATH_TXMAXTRY; if (shortPreamble) + txrate = an->an_tx_mgtratesp; + else txrate = an->an_tx_mgtrate; - else - txrate = an->an_tx_mgtratesp; break; case IEEE80211_FC0_TYPE_CTL: subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; @@ -2010,9 +1929,9 @@ rix = 0; /* XXX lowest rate */ try0 = ATH_TXMAXTRY; if (shortPreamble) + txrate = an->an_tx_mgtratesp; + else txrate = an->an_tx_mgtrate; - else - txrate = an->an_tx_mgtratesp; break; default: rix = an->an_tx_rix0; @@ -2025,9 +1944,9 @@ return EIO; } if (shortPreamble) + txrate = an->an_tx_rate0sp; + else txrate = an->an_tx_rate0; - else - txrate = an->an_tx_rate0sp; break; } @@ -2670,7 +2589,8 @@ } static int -ath_getchannels(struct ath_softc *sc, u_int cc, HAL_BOOL outdoor, HAL_BOOL xchans) +ath_getchannels(struct ath_softc *sc, u_int cc, + HAL_BOOL outdoor, HAL_BOOL xchanmode) { struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = &ic->ic_if; @@ -2685,7 +2605,7 @@ return ENOMEM; } if (!ath_hal_init_channels(ah, chans, IEEE80211_CHAN_MAX, &nchan, - cc, HAL_MODE_ALL, outdoor, xchans)) { + cc, HAL_MODE_ALL, outdoor, xchanmode)) { if_printf(ifp, "unable to collect channel list from hal\n"); free(chans, M_TEMP); return EINVAL; @@ -2866,23 +2786,26 @@ ath_rate_ctl_start(struct ath_softc *sc, struct ieee80211_node *ni) { #define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL) - int srate; + struct ieee80211com *ic = &sc->sc_ic; - KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates")); - /* start with highest negotiated rate */ - srate = ni->ni_rates.rs_nrates - 1; - if (sc->sc_curmode != IEEE80211_MODE_11B) { - /* - * 11a and 11g work better if you start at 24Mb - * or 36Mb and raise the rate. Scan the negotiated - * rate set to find the closest rate. - */ - /* NB: rate set assumed sorted */ - for (; srate >= 0 && RATE(srate) > 72; srate--) - ; - KASSERT(srate >= 0, ("bogus rate set")); - } - ath_rate_update(sc, ni, srate); + if (ic->ic_fixed_rate == -1) { + KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates")); + /* start with highest negotiated rate */ + int srate = ni->ni_rates.rs_nrates - 1; + if (sc->sc_curmode != IEEE80211_MODE_11B) { + /* + * 11a and 11g work better if you start at 24Mb + * or 36Mb and raise the rate. Scan the negotiated + * rate set to find the closest rate. + */ + /* NB: rate set assumed sorted */ + for (; srate >= 0 && RATE(srate) > 72; srate--) + ; + KASSERT(srate >= 0, ("bogus rate set")); + } + ath_rate_update(sc, ni, srate); + } else + ath_rate_update(sc, ni, ic->ic_fixed_rate); #undef RATE } ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#6 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 2001 Atsushi Onoe - * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -90,9 +90,9 @@ }; void -ieee80211_ifattach(struct ifnet *ifp) +ieee80211_ifattach(struct ieee80211com *ic) { - struct ieee80211com *ic = (void *)ifp; + struct ifnet *ifp = ic->ic_ifp; struct ieee80211_channel *c; int i; @@ -101,7 +101,7 @@ bpfattach2(ifp, DLT_IEEE802_11, sizeof(struct ieee80211_frame_addr4), &ic->ic_rawbpf); #endif - ieee80211_crypto_attach(ifp); + ieee80211_crypto_attach(ic); /* * Fill in 802.11 available channel set, mark @@ -150,18 +150,18 @@ ic->ic_lintval = 100; /* default sleep */ ic->ic_bmisstimeout = 7*ic->ic_lintval; /* default 7 beacons */ - ieee80211_node_attach(ifp); - ieee80211_proto_attach(ifp); + ieee80211_node_attach(ic); + ieee80211_proto_attach(ic); } void -ieee80211_ifdetach(struct ifnet *ifp) +ieee80211_ifdetach(struct ieee80211com *ic) { - struct ieee80211com *ic = (void *)ifp; + struct ifnet *ifp = ic->ic_ifp; - ieee80211_proto_detach(ifp); - ieee80211_crypto_detach(ifp); - ieee80211_node_detach(ifp); + ieee80211_proto_detach(ic); + ieee80211_crypto_detach(ic); + ieee80211_node_detach(ic); ifmedia_removeall(&ic->ic_media); #if NBPFILTER > 0 bpfdetach(ifp); @@ -247,13 +247,13 @@ * ieee80211_attach and before most anything else. */ void -ieee80211_media_init(struct ifnet *ifp, +ieee80211_media_init(struct ieee80211com *ic, ifm_change_cb_t media_change, ifm_stat_cb_t media_stat) { #define ADD(_ic, _s, _o) \ ifmedia_add(&(_ic)->ic_media, \ IFM_MAKEWORD(IFM_IEEE80211, (_s), (_o), 0), 0, NULL) - struct ieee80211com *ic = (void *)ifp; + struct ifnet *ifp = ic->ic_ifp; struct ifmediareq imr; int i, j, mode, rate, maxrate, mword, mopt, r; struct ieee80211_rateset *rs; @@ -263,7 +263,7 @@ * Do late attach work that must wait for any subclass * (i.e. driver) work such as overriding methods. */ - ieee80211_node_lateattach(ifp); + ieee80211_node_lateattach(ic); /* * Fill in media characteristics. @@ -655,8 +655,9 @@ /* validate new mode */ if ((ic->ic_modecaps & (1<ic_modecaps)); + IEEE80211_DPRINTF(ic, NETIF_MSG_ANY, + "%s: mode %u not supported (caps 0x%x)\n", + __func__, mode, ic->ic_modecaps); return EINVAL; } @@ -664,7 +665,7 @@ * Verify at least one channel is present in the available * channel list before committing to the new mode. */ - KASSERT(mode < N(chanflags), ("Unexpected mode %u\n", mode)); + KASSERT(mode < N(chanflags), ("Unexpected mode %u", mode)); modeflags = chanflags[mode]; for (i = 0; i <= IEEE80211_CHAN_MAX; i++) { c = &ic->ic_channels[i]; @@ -678,8 +679,8 @@ } } if (i > IEEE80211_CHAN_MAX) { - IEEE80211_DPRINTF(("%s: no channels found for mode %u\n", - __func__, mode)); + IEEE80211_DPRINTF(ic, NETIF_MSG_ANY, + "%s: no channels found for mode %u\n", __func__, mode); return EINVAL; } @@ -883,34 +884,3 @@ ieeerates[IFM_SUBTYPE(mword)] : 0; #undef N } - -#ifdef __FreeBSD__ -/* - * Module glue. - * - * NB: the module name is "wlan" for compatibility with NetBSD. - */ - -static int -ieee80211_modevent(module_t mod, int type, void *unused) -{ - switch (type) { - case MOD_LOAD: - if (bootverbose) - printf("wlan: <802.11 Link Layer>\n"); - return 0; - case MOD_UNLOAD: - return 0; - } - return EINVAL; -} - -static moduledata_t ieee80211_mod = { - "wlan", - ieee80211_modevent, - 0 -}; -DECLARE_MODULE(wlan, ieee80211_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); -MODULE_VERSION(wlan, 1); -MODULE_DEPEND(wlan, rc4, 1, 1, 1); -#endif /* __FreeBSD__ */ ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211.h#6 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: ieee80211.h,v 1.4 2003/10/15 11:43:51 dyoung Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe - * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,6 +69,22 @@ /* see below */ } __attribute__((__packed__)); +struct ieee80211_qosframe { + u_int8_t i_fc[2]; + u_int8_t i_dur[2]; + u_int8_t i_addr1[IEEE80211_ADDR_LEN]; + u_int8_t i_addr2[IEEE80211_ADDR_LEN]; + u_int8_t i_addr3[IEEE80211_ADDR_LEN]; + u_int8_t i_seq[2]; + u_int8_t i_qos[2]; + /* possibly followed by addr4[IEEE80211_ADDR_LEN]; */ + /* see below */ +} __attribute__((__packed__)); + +struct ieee80211_qoscntl { + u_int8_t i_qos[2]; +}; + struct ieee80211_frame_addr4 { u_int8_t i_fc[2]; u_int8_t i_dur[2]; @@ -79,6 +95,59 @@ u_int8_t i_addr4[IEEE80211_ADDR_LEN]; } __attribute__((__packed__)); + +struct ieee80211_qosframe_addr4 { + u_int8_t i_fc[2]; + u_int8_t i_dur[2]; + u_int8_t i_addr1[IEEE80211_ADDR_LEN]; + u_int8_t i_addr2[IEEE80211_ADDR_LEN]; + u_int8_t i_addr3[IEEE80211_ADDR_LEN]; + u_int8_t i_seq[2]; + u_int8_t i_addr4[IEEE80211_ADDR_LEN]; + u_int8_t i_qos[2]; +} __attribute__((__packed__)); + +/* + * Management Notification Frame + */ +struct ieee80211_mnf { + u_int8_t mnf_category; + u_int8_t mnf_action; + u_int8_t mnf_dialog; + u_int8_t mnf_status; +} __attribute__((__packed__)); +#define MNF_SETUP_REQ 0 +#define MNF_SETUP_RESP 1 +#define MNF_TEARDOWN 2 + +/* + * WME/802.11e Tspec Element + */ +struct ieee80211_wme_tspec { + u_int8_t ts_id; + u_int8_t ts_len; + u_int8_t ts_oui[3]; + u_int8_t ts_oui_type; + u_int8_t ts_oui_subtype; + u_int8_t ts_version; + u_int8_t ts_tsinfo[3]; + u_int8_t ts_nom_msdu[2]; + u_int8_t ts_max_msdu[2]; + u_int8_t ts_min_svc[4]; + u_int8_t ts_max_svc[4]; + u_int8_t ts_inactv_intv[4]; + u_int8_t ts_susp_intv[4]; + u_int8_t ts_start_svc[4]; + u_int8_t ts_min_rate[4]; + u_int8_t ts_mean_rate[4]; + u_int8_t ts_max_burst[4]; + u_int8_t ts_min_phy[4]; + u_int8_t ts_peak_rate[4]; + u_int8_t ts_delay[4]; + u_int8_t ts_surplus[2]; + u_int8_t ts_medium_time[2]; +} __attribute__((__packed__)); + #define IEEE80211_FC0_VERSION_MASK 0x03 #define IEEE80211_FC0_VERSION_SHIFT 0 #define IEEE80211_FC0_VERSION_0 0x00 @@ -207,7 +276,7 @@ * octet information[length] */ -typedef uint8_t *ieee80211_mgt_beacon_t; +typedef u_int8_t *ieee80211_mgt_beacon_t; #define IEEE80211_BEACON_INTERVAL(beacon) \ ((beacon)[8] | ((beacon)[9] << 8)) ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_compat.c#2 (text+ko) ==== ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_compat.h#3 (text+ko) ==== ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_crypto.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 2001 Atsushi Onoe - * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -76,9 +76,8 @@ static u_int32_t ieee80211_crc_update(u_int32_t crc, u_int8_t *buf, int len); void -ieee80211_crypto_attach(struct ifnet *ifp) +ieee80211_crypto_attach(struct ieee80211com *ic) { - struct ieee80211com *ic = (void *)ifp; /* * Setup crypto support. @@ -88,9 +87,8 @@ } void -ieee80211_crypto_detach(struct ifnet *ifp) +ieee80211_crypto_detach(struct ieee80211com *ic) { - struct ieee80211com *ic = (void *)ifp; if (ic->ic_wep_ctx != NULL) { FREE(ic->ic_wep_ctx, M_DEVBUF); @@ -99,9 +97,8 @@ } struct mbuf * -ieee80211_wep_crypt(struct ifnet *ifp, struct mbuf *m0, int txflag) +ieee80211_wep_crypt(struct ieee80211com *ic, struct mbuf *m0, int txflag) { - struct ieee80211com *ic = (void *)ifp; struct mbuf *m, *n, *n0; struct ieee80211_frame *wh; int i, left, len, moff, noff, kid; @@ -265,7 +262,7 @@ if (crc != le32toh(*(u_int32_t *)crcbuf)) { #ifdef IEEE80211_DEBUG if (ieee80211_debug) { - if_printf(ifp, "decrypt CRC error\n"); + if_printf(ic->ic_ifp, "decrypt CRC error\n"); if (ieee80211_debug > 1) ieee80211_dump_pkt(n0->m_data, n0->m_len, -1, -1); ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_crypto.h#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: ieee80211_crypto.h,v 1.2 2003/09/14 01:14:55 dyoung Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe - * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ u_int8_t wk_key[IEEE80211_KEYBUF_SIZE]; }; -extern void ieee80211_crypto_attach(struct ifnet *); -extern void ieee80211_crypto_detach(struct ifnet *); -extern struct mbuf *ieee80211_wep_crypt(struct ifnet *, struct mbuf *, int); +extern void ieee80211_crypto_attach(struct ieee80211com *); +extern void ieee80211_crypto_detach(struct ieee80211com *); +extern struct mbuf *ieee80211_wep_crypt(struct ieee80211com *, struct mbuf *, int); #endif /* _NET80211_IEEE80211_CRYPTO_H_ */ ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_input.c#5 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 2001 Atsushi Onoe - * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -77,17 +77,17 @@ * by the 802.11 layer. */ void -ieee80211_input(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni, - int rssi, u_int32_t rstamp) +ieee80211_input(struct ieee80211com *ic, struct mbuf *m, + struct ieee80211_node *ni, int rssi, u_int32_t rstamp) { - struct ieee80211com *ic = (void *)ifp; + struct ifnet *ifp = ic->ic_ifp; struct ieee80211_frame *wh; struct ether_header *eh; struct mbuf *m1; int len; u_int8_t dir, type, subtype; u_int8_t *bssid; - u_int16_t rxseq; + u_int16_t rxseq, fragno; KASSERT(ni != NULL, ("null node")); @@ -101,17 +101,18 @@ /* * In monitor mode, send everything directly to bpf. + * Also do not process frames w/o i_addr2 any further. * XXX may want to include the CRC */ - if (ic->ic_opmode == IEEE80211_M_MONITOR) + if (ic->ic_opmode == IEEE80211_M_MONITOR || + m->m_pkthdr.len < sizeof(struct ieee80211_frame_min)) goto out; wh = mtod(m, struct ieee80211_frame *); if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) != IEEE80211_FC0_VERSION_0) { - if (ifp->if_flags & IFF_DEBUG) - if_printf(ifp, "receive packet with wrong version: %x\n", - wh->i_fc[0]); + IEEE80211_DPRINTF(ic, NETIF_MSG_ANY, + "receive packet with wrong version: %x\n", wh->i_fc[0]); ieee80211_unref_node(&ni); ic->ic_stats.is_rx_badversion++; goto err; @@ -126,7 +127,8 @@ */ if (m->m_pkthdr.len < sizeof(struct ieee80211_frame)) { /* XXX statistic */ - IEEE80211_DPRINTF2(("%s: frame too short, len %u\n", + IEEE80211_DPRINTF(ic, NETIF_MSG_ANY, + "%s: frame too short, len %u\n", __func__, m->m_pkthdr.len)); ic->ic_stats.is_rx_tooshort++; goto out; /* XXX */ @@ -134,11 +136,13 @@ if (ic->ic_state != IEEE80211_S_SCAN) { switch (ic->ic_opmode) { case IEEE80211_M_STA: - if (!IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_bssid)) { + bssid = wh->i_addr2; + if (!IEEE80211_ADDR_EQ(bssid, ni->ni_bssid)) { /* not interested in */ - IEEE80211_DPRINTF2(("%s: discard frame from " + IEEE80211_DPRINTF(ic, NETIF_MSG_INPUT, + "%s: discard frame from " "bss %s\n", __func__, - ether_sprintf(wh->i_addr2))); + ether_sprintf(wh->i_addr2)); ic->ic_stats.is_rx_wrongbss++; goto out; } @@ -151,11 +155,14 @@ else bssid = wh->i_addr1; if (!IEEE80211_ADDR_EQ(bssid, ic->ic_bss->ni_bssid) && - !IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr)) { + !IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr) && + (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == + IEEE80211_FC0_TYPE_DATA) { /* not interested in */ - IEEE80211_DPRINTF2(("%s: discard frame from " + IEEE80211_DPRINTF(ic, NETIF_MSG_ANY, + "%s: discard frame from " "bss %s\n", __func__, - ether_sprintf(bssid))); + ether_sprintf(bssid)); ic->ic_stats.is_rx_wrongbss++; goto out; } @@ -164,23 +171,58 @@ goto out; default: /* XXX catch bad values */ - break; + goto out; } ni->ni_rssi = rssi; ni->ni_rstamp = rstamp; rxseq = ni->ni_rxseq; + fragno = ni->ni_fragno; ni->ni_rxseq = le16toh(*(u_int16_t *)wh->i_seq) >> IEEE80211_SEQ_SEQ_SHIFT; - /* TODO: fragment */ + ni->ni_fragno = + le16toh(*(u_int16_t *)wh->i_seq) & IEEE80211_SEQ_FRAG_MASK; if ((wh->i_fc[1] & IEEE80211_FC1_RETRY) && - rxseq == ni->ni_rxseq) { - /* duplicate, silently discarded */ + rxseq == ni->ni_rxseq && fragno == ni->ni_fragno) { + /* duplicate, discard */ + IEEE80211_DPRINTF(ic, NETIF_MSG_INPUT, + "[%s] discard duplicate frame from %s, " + "seqno %u, fragno %u\n", + ieee80211_state_name[ic->ic_state], + ether_sprintf(bssid), rxseq, fragno); ic->ic_stats.is_rx_dup++; /* XXX per-station stat */ goto out; } ni->ni_inact = 0; } + if (ic->ic_set_tim != NULL && + (wh->i_fc[1] & IEEE80211_FC1_PWR_MGT) + && ni->ni_pwrsave == 0) { + /* turn on power save mode */ + IEEE80211_DPRINTF(ic, NETIF_MSG_POWER, + "power save mode on for %s\n", + ether_sprintf(wh->i_addr2)); + ni->ni_pwrsave = IEEE80211_PS_SLEEP; + } + if (ic->ic_set_tim != NULL && + (wh->i_fc[1] & IEEE80211_FC1_PWR_MGT) == 0 && + ni->ni_pwrsave != 0) { + /* turn off power save mode, dequeue stored packets */ + ni->ni_pwrsave = 0; + if (ic->ic_set_tim) + ic->ic_set_tim(ic, ni->ni_associd, 0); + IEEE80211_DPRINTF(ic, NETIF_MSG_POWER, + "power save mode off for %s\n", + ether_sprintf(wh->i_addr2)); + while (!_IF_QLEN(&ni->ni_savedq) != 0) { + struct mbuf *m0; + IF_DEQUEUE(&ni->ni_savedq, m0); + /* XXX need different driver interface */ + IF_ENQUEUE(&ic->ic_pwrsaveq, m); + (*ifp->if_start)(ifp); + } + } + switch (type) { case IEEE80211_FC0_TYPE_DATA: switch (ic->ic_opmode) { @@ -198,6 +240,8 @@ * It should be silently discarded for * SIMPLEX interface. */ + IEEE80211_DPRINTF(ic, NETIF_MSG_INPUT, + "%s", "discard multicast echo\n"); ic->ic_stats.is_rx_mcastecho++; goto out; } @@ -216,9 +260,10 @@ } /* check if source STA is associated */ if (ni == ic->ic_bss) { - IEEE80211_DPRINTF(("%s: data from unknown src " + IEEE80211_DPRINTF(ic, NETIF_MSG_INPUT, + "%s: data from unknown src " "%s\n", __func__, - ether_sprintf(wh->i_addr2))); + ether_sprintf(wh->i_addr2)); /* NB: caller deals with reference */ ni = ieee80211_dup_bss(ic, wh->i_addr2); if (ni != NULL) { @@ -231,9 +276,9 @@ goto err; } if (ni->ni_associd == 0) { - IEEE80211_DPRINTF(("ieee80211_input: " - "data from unassoc src %s\n", - ether_sprintf(wh->i_addr2))); + IEEE80211_DPRINTF(ic, NETIF_MSG_INPUT, + "%s: data from unassoc src %s\n", + __func__, ether_sprintf(wh->i_addr2))); IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_DISASSOC, IEEE80211_REASON_NOT_ASSOCED); @@ -261,8 +306,18 @@ /* copy to listener after decrypt */ if (ic->ic_rawbpf) bpf_mtap(ic->ic_rawbpf, m); + /* XXX tap before or after defrag? */ + m = ieee80211_defrag(ic, ni, m); + if (m == NULL) { + /* XXX statistic */ + /* Fragment dropped or frame not complete yet */ + goto out; + } m = ieee80211_decap(ifp, m); if (m == NULL) { + IEEE80211_DPRINTF(ic, NETIF_MSG_INPUT, + "%s: decapsulation error for src %s\n", + __func__, ether_sprintf(wh->i_addr2)); ic->ic_stats.is_rx_decap++; goto err; } @@ -365,9 +420,21 @@ case IEEE80211_FC0_TYPE_CTL: ic->ic_stats.is_rx_ctl++; + if (ic->ic_opmode != IEEE80211_M_HOSTAP) + goto out; + subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; + if (subtype == IEEE80211_FC0_SUBTYPE_PS_POLL) { + /* XXX statistic */ + /* Dump out a single packet from the host */ + IEEE80211_DPRINTF(ic, NETIF_MSG_POWER, + "got power save probe from %s\n", + ether_sprintf(wh->i_addr2)); + ieee80211_recv_pspoll(ic, m, rssi, rstamp); + } goto out; default: - IEEE80211_DPRINTF(("%s: bad type %x\n", __func__, type)); + IEEE80211_DPRINTF(ic, NETIF_MSG_ANY, + "%s: bad type %x\n", __func__, type); /* should not come here */ break; } @@ -381,8 +448,105 @@ } } +/* + * This function reassemble fragments using the skb of the 1st fragment, + * if large enough. If not, a new skb is allocated to hold incoming + * fragments. + * + * Fragments are copied at the end of the previous fragment. A different + * strategy could have been used, where a non-linear skb is allocated and + * fragments attached to that skb. + */ +static struct mbuf * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 23 15:24:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFB8416A4E3; Fri, 23 Jan 2004 15:24:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9EBB016A4CE for ; Fri, 23 Jan 2004 15:24:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E947643D93 for ; Fri, 23 Jan 2004 15:20:23 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0NNKN0B036757 for ; Fri, 23 Jan 2004 15:20:23 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0NNKMYW036736 for perforce@freebsd.org; Fri, 23 Jan 2004 15:20:22 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 23 Jan 2004 15:20:22 -0800 (PST) Message-Id: <200401232320.i0NNKMYW036736@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 45818 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jan 2004 23:24:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=45818 Change 45818 by sam@sam_ebb on 2004/01/23 15:19:23 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/alpha/alpha/support.s#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/netperf+sockets/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#12 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#11 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#12 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#10 integrate .. //depot/projects/netperf+sockets/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/netperf+sockets/sys/conf/files.i386#5 integrate .. //depot/projects/netperf+sockets/sys/conf/files.pc98#4 integrate .. //depot/projects/netperf+sockets/sys/conf/files.powerpc#3 integrate .. //depot/projects/netperf+sockets/sys/conf/kern.post.mk#6 integrate .. //depot/projects/netperf+sockets/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/netperf+sockets/sys/conf/options.i386#6 integrate .. //depot/projects/netperf+sockets/sys/conf/options.powerpc#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_pci_link.c#5 integrate .. //depot/projects/netperf+sockets/sys/dev/amd/amd.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwohci.c#6 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwohci_pci.c#5 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/sbp_targ.c#5 integrate .. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#12 integrate .. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndisvar.h#6 integrate .. //depot/projects/netperf+sockets/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/netperf+sockets/sys/dev/pccard/pccarddevs.h#5 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/vchan.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/syscons/scterm-dumb.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/umass.c#5 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs.h#10 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs_data.h#10 integrate .. //depot/projects/netperf+sockets/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/netperf+sockets/sys/geom/bde/g_bde_crypt.c#2 integrate .. //depot/projects/netperf+sockets/sys/geom/geom_dev.c#2 integrate .. //depot/projects/netperf+sockets/sys/geom/geom_disk.c#3 integrate .. //depot/projects/netperf+sockets/sys/geom/geom_event.c#4 integrate .. //depot/projects/netperf+sockets/sys/geom/geom_subr.c#4 integrate .. //depot/projects/netperf+sockets/sys/gnu/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/conf/NOTES#7 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/p4tcc.c#1 branch .. //depot/projects/netperf+sockets/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/trap.c#4 integrate .. //depot/projects/netperf+sockets/sys/isofs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_exit.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_fork.c#5 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_jail.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_prot.c#4 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_tc.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_thread.c#6 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/sys_generic.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/netperf+sockets/sys/modules/firewire/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/ncp/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/nwfs/Makefile#3 integrate .. //depot/projects/netperf+sockets/sys/modules/smbfs/Makefile#3 integrate .. //depot/projects/netperf+sockets/sys/modules/syscons/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/net/if.c#5 integrate .. //depot/projects/netperf+sockets/sys/net/if_media.h#4 integrate .. //depot/projects/netperf+sockets/sys/net/if_ppp.c#3 integrate .. //depot/projects/netperf+sockets/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/netperf+sockets/sys/net/if_vlan_var.h#4 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#10 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/netperf+sockets/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/netperf+sockets/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/netperf+sockets/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/netperf+sockets/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/netperf+sockets/sys/pc98/conf/NOTES#6 integrate .. //depot/projects/netperf+sockets/sys/pc98/pc98/sio.c#4 integrate .. //depot/projects/netperf+sockets/sys/pci/if_rl.c#5 integrate .. //depot/projects/netperf+sockets/sys/pci/if_sk.c#3 integrate .. //depot/projects/netperf+sockets/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/netperf+sockets/sys/powerpc/include/float.h#2 integrate .. //depot/projects/netperf+sockets/sys/powerpc/include/sc_machdep.h#1 branch .. //depot/projects/netperf+sockets/sys/powerpc/ofw/ofw_syscons.c#1 branch .. //depot/projects/netperf+sockets/sys/powerpc/ofw/ofw_syscons.h#1 branch .. //depot/projects/netperf+sockets/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/netperf+sockets/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/netperf+sockets/sys/powerpc/powerpc/sc_machdep.c#1 branch .. //depot/projects/netperf+sockets/sys/powerpc/powerpc/trap_subr.S#2 integrate .. //depot/projects/netperf+sockets/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/netperf+sockets/sys/sys/_task.h#1 branch .. //depot/projects/netperf+sockets/sys/sys/jail.h#2 integrate .. //depot/projects/netperf+sockets/sys/sys/proc.h#5 integrate .. //depot/projects/netperf+sockets/sys/sys/systm.h#4 integrate .. //depot/projects/netperf+sockets/sys/sys/taskqueue.h#2 integrate .. //depot/projects/netperf+sockets/sys/sys/user.h#2 integrate .. //depot/projects/netperf+sockets/sys/ufs/ffs/ffs_vnops.c#2 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/alpha/alpha/support.s#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/alpha/alpha/support.s,v 1.15 2003/07/24 07:49:45 marcel Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.16 2004/01/19 21:27:10 phk Exp $ */ /* @@ -680,8 +680,10 @@ longjmp_botch: lda a0, longjmp_botchmsg - mov ra, a1 - CALL(panic) + mov 0, a1 + mov 0, a2 + mov ra, a3 + CALL(__panic) call_pal PAL_bugchk .data ==== //depot/projects/netperf+sockets/sys/amd64/amd64/cpu_switch.S#3 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.144 2003/11/17 08:58:12 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.145 2004/01/23 01:04:28 peter Exp $ */ #include @@ -243,7 +243,7 @@ pushq %r14 pushq %r15 pushq $sw0_1 - call panic + call __panic sw0_1: .asciz "cpu_throw: no newthread supplied" badsw2: @@ -263,7 +263,7 @@ pushq %r14 pushq %r15 pushq $sw0_2 - call panic + call __panic sw0_2: .asciz "cpu_switch: no curthread supplied" badsw3: @@ -283,7 +283,7 @@ pushq %r14 pushq %r15 pushq $sw0_3 - call panic + call __panic sw0_3: .asciz "cpu_switch: no newthread supplied" #endif ==== //depot/projects/netperf+sockets/sys/boot/i386/libi386/biosdisk.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.40 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.41 2004/01/21 23:22:29 jhb Exp $"); /* * BIOS disk device handling. @@ -867,7 +867,7 @@ */ x = min(FLOPPY_BOUNCEBUF, (unsigned)blks); bbuf = malloc(x * 2 * BIOSDISK_SECSIZE); - if (((u_int32_t)VTOP(bbuf) & 0xffff0000) == ((u_int32_t)VTOP(dest + x * BIOSDISK_SECSIZE) & 0xffff0000)) { + if (((u_int32_t)VTOP(bbuf) & 0xffff0000) == ((u_int32_t)VTOP(bbuf + x * BIOSDISK_SECSIZE) & 0xffff0000)) { breg = bbuf; } else { breg = bbuf + x * BIOSDISK_SECSIZE; @@ -1000,7 +1000,7 @@ x = min(FLOPPY_BOUNCEBUF, (unsigned)blks); bbuf = malloc(x * 2 * BIOSDISK_SECSIZE); - if (((u_int32_t)VTOP(bbuf) & 0xffff0000) == ((u_int32_t)VTOP(dest + x * BIOSDISK_SECSIZE) & 0xffff0000)) { + if (((u_int32_t)VTOP(bbuf) & 0xffff0000) == ((u_int32_t)VTOP(bbuf + x * BIOSDISK_SECSIZE) & 0xffff0000)) { breg = bbuf; } else { breg = bbuf + x * BIOSDISK_SECSIZE; ==== //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#12 (text+ko) ==== @@ -31,23 +31,25 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.29 2004/01/13 22:49:45 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.32 2004/01/21 19:14:52 wpaul Exp $"); #include +#include +#include #include #include #include #include #include #include -#include +#include #include #include #include #include -#include #include +#include #include #include #include @@ -85,7 +87,35 @@ __stdcall static void ndis_resetdone_func(ndis_handle, ndis_status, uint8_t); __stdcall static void ndis_sendrsrcavail_func(ndis_handle); +struct ndis_req { + void (*nr_func)(void *); + void *nr_arg; + int nr_exit; + STAILQ_ENTRY(ndis_req) link; +}; + +struct ndisproc { + struct ndisqhead *np_q; + struct proc *np_p; +}; + +static int ndis_create_kthreads(void); +static void ndis_destroy_kthreads(void); +static void ndis_stop_thread(int); +static int ndis_enlarge_thrqueue(int); +static int ndis_shrink_thrqueue(int); +static void ndis_runq(void *); + +extern struct mtx_pool *ndis_mtxpool; static uma_zone_t ndis_packet_zone, ndis_buffer_zone; +struct mtx *ndis_thr_mtx; +static STAILQ_HEAD(ndisqhead, ndis_req) ndis_ttodo; +struct ndisqhead ndis_itodo; +struct ndisqhead ndis_free; +static int ndis_jobs = 32; + +static struct ndisproc ndis_tproc; +static struct ndisproc ndis_iproc; /* * This allows us to export our symbols to other modules. @@ -111,9 +141,15 @@ ndis_buffer_zone = uma_zcreate("NDIS buffer", sizeof(ndis_buffer), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + + ndis_create_kthreads(); + break; case MOD_UNLOAD: case MOD_SHUTDOWN: + /* stop kthreads */ + ndis_destroy_kthreads(); + /* Shut down subsystems */ ndis_libfini(); ntoskrnl_libfini(); @@ -132,7 +168,268 @@ DEV_MODULE(ndisapi, ndis_modevent, NULL); MODULE_VERSION(ndisapi, 1); +/* + * We create two kthreads for the NDIS subsystem. One of them is a task + * queue for performing various odd jobs. The other is an swi thread + * reserved exclusively for running interrupt handlers. The reason we + * have our own task queue is that there are some cases where we may + * need to sleep for a significant amount of time, and if we were to + * use one of the taskqueue threads, we might delay the processing + * of other pending tasks which might need to run right away. We have + * a separate swi thread because we don't want our interrupt handling + * to be delayed either. + * + * By default there are 32 jobs available to start, and another 8 + * are added to the free list each time a new device is created. + */ + +static void +ndis_runq(arg) + void *arg; +{ + struct ndis_req *r = NULL, *die = NULL; + struct ndisproc *p; + + p = arg; + + while (1) { + kthread_suspend(p->np_p, 0); + + /* Look for any jobs on the work queue. */ + + mtx_pool_lock(ndis_mtxpool, ndis_thr_mtx); + while(STAILQ_FIRST(p->np_q) != NULL) { + r = STAILQ_FIRST(p->np_q); + STAILQ_REMOVE_HEAD(p->np_q, link); + mtx_pool_unlock(ndis_mtxpool, ndis_thr_mtx); + + /* Do the work. */ + + if (r->nr_func != NULL) + (*r->nr_func)(r->nr_arg); + + mtx_pool_lock(ndis_mtxpool, ndis_thr_mtx); + STAILQ_INSERT_HEAD(&ndis_free, r, link); + + /* Check for a shutdown request */ + + if (r->nr_exit == TRUE) + die = r; + } + mtx_pool_unlock(ndis_mtxpool, ndis_thr_mtx); + + /* Bail if we were told to shut down. */ + + if (die != NULL) + break; + } + + wakeup(die); + mtx_lock(&Giant); + kthread_exit(0); +} + +static int +ndis_create_kthreads() +{ + struct ndis_req *r; + int i, error = 0; + + ndis_thr_mtx = mtx_pool_alloc(ndis_mtxpool); + STAILQ_INIT(&ndis_ttodo); + STAILQ_INIT(&ndis_itodo); + STAILQ_INIT(&ndis_free); + + for (i = 0; i < ndis_jobs; i++) { + r = malloc(sizeof(struct ndis_req), M_DEVBUF, M_WAITOK); + if (r == NULL) { + error = ENOMEM; + break; + } + STAILQ_INSERT_HEAD(&ndis_free, r, link); + } + + if (error == 0) { + ndis_tproc.np_q = &ndis_ttodo; + error = kthread_create(ndis_runq, &ndis_tproc, + &ndis_tproc.np_p, RFHIGHPID, 0, "ndis taskqueue"); + } + + if (error == 0) { + ndis_iproc.np_q = &ndis_itodo; + error = kthread_create(ndis_runq, &ndis_iproc, + &ndis_iproc.np_p, RFHIGHPID, 0, "ndis swi"); + } + + if (error) { + while ((r = STAILQ_FIRST(&ndis_free)) != NULL) { + STAILQ_REMOVE_HEAD(&ndis_free, link); + free(r, M_DEVBUF); + } + return(error); + } + + return(0); +} + +static void +ndis_destroy_kthreads() +{ + struct ndis_req *r; + + /* Stop the threads. */ + + ndis_stop_thread(NDIS_TASKQUEUE); + ndis_stop_thread(NDIS_SWI); + + /* Destroy request structures. */ + while ((r = STAILQ_FIRST(&ndis_free)) != NULL) { + STAILQ_REMOVE_HEAD(&ndis_free, link); + free(r, M_DEVBUF); + } + + return; +} + +static void +ndis_stop_thread(t) + int t; +{ + struct ndis_req *r; + struct timeval tv; + struct ndisqhead *q; + struct proc *p; + + if (t == NDIS_TASKQUEUE) { + q = &ndis_ttodo; + p = ndis_tproc.np_p; + } else { + q = &ndis_itodo; + p = ndis_iproc.np_p; + } + + /* Create and post a special 'exit' job. */ + + mtx_pool_lock(ndis_mtxpool, ndis_thr_mtx); + r = STAILQ_FIRST(&ndis_free); + STAILQ_REMOVE_HEAD(&ndis_free, link); + r->nr_func = NULL; + r->nr_arg = NULL; + r->nr_exit = TRUE; + STAILQ_INSERT_TAIL(q, r, link); + mtx_pool_unlock(ndis_mtxpool, ndis_thr_mtx); + + kthread_resume(p); + + /* wait for thread exit */ + + tv.tv_sec = 60; + tv.tv_usec = 0; + tsleep(r, PPAUSE|PCATCH, "ndisthrexit", tvtohz(&tv)); + + /* Now empty the job list. */ + + mtx_pool_lock(ndis_mtxpool, ndis_thr_mtx); + while ((r = STAILQ_FIRST(q)) != NULL) { + STAILQ_REMOVE_HEAD(q, link); + STAILQ_INSERT_HEAD(&ndis_free, r, link); + } + mtx_pool_unlock(ndis_mtxpool, ndis_thr_mtx); + + return; +} + +static int +ndis_enlarge_thrqueue(cnt) + int cnt; +{ + struct ndis_req *r; + int i; + + for (i = 0; i < cnt; i++) { + r = malloc(sizeof(struct ndis_req), M_DEVBUF, M_WAITOK); + if (r == NULL) + return(ENOMEM); + mtx_pool_lock(ndis_mtxpool, ndis_thr_mtx); + STAILQ_INSERT_HEAD(&ndis_free, r, link); + ndis_jobs++; + mtx_pool_unlock(ndis_mtxpool, ndis_thr_mtx); + } + + return(0); +} + +static int +ndis_shrink_thrqueue(cnt) + int cnt; +{ + struct ndis_req *r; + int i; + + for (i = 0; i < cnt; i++) { + mtx_pool_lock(ndis_mtxpool, ndis_thr_mtx); + r = STAILQ_FIRST(&ndis_free); + if (r == NULL) { + mtx_pool_unlock(ndis_mtxpool, ndis_thr_mtx); + return(ENOMEM); + } + STAILQ_REMOVE_HEAD(&ndis_free, link); + ndis_jobs--; + mtx_pool_unlock(ndis_mtxpool, ndis_thr_mtx); + free(r, M_DEVBUF); + } + + return(0); +} + +int +ndis_sched(func, arg, t) + void (*func)(void *); + void *arg; + int t; +{ + struct ndis_req *r; + struct ndisqhead *q; + struct proc *p; + + if (t == NDIS_TASKQUEUE) { + q = &ndis_ttodo; + p = ndis_tproc.np_p; + } else { + q = &ndis_itodo; + p = ndis_iproc.np_p; + } + + mtx_pool_lock(ndis_mtxpool, ndis_thr_mtx); + /* + * Check to see if an instance of this job is already + * pending. If so, don't bother queuing it again. + */ + STAILQ_FOREACH(r, q, link) { + if (r->nr_func == func && r->nr_arg == arg) { + mtx_pool_unlock(ndis_mtxpool, ndis_thr_mtx); + return(0); + } + } + r = STAILQ_FIRST(&ndis_free); + if (r == NULL) { + mtx_pool_unlock(ndis_mtxpool, ndis_thr_mtx); + return(EAGAIN); + } + STAILQ_REMOVE_HEAD(&ndis_free, link); + r->nr_func = func; + r->nr_arg = arg; + r->nr_exit = FALSE; + STAILQ_INSERT_TAIL(q, r, link); + mtx_pool_unlock(ndis_mtxpool, ndis_thr_mtx); + + /* Post the job. */ + kthread_resume(p); + + return(0); +} + __stdcall static void ndis_sendrsrcavail_func(adapter) ndis_handle adapter; @@ -704,6 +1001,9 @@ rval == NDIS_STATUS_NOT_ACCEPTED) return(ENOTSUP); + if (rval != NDIS_STATUS_SUCCESS) + return(ENODEV); + return(0); } @@ -1065,6 +1365,9 @@ rval == NDIS_STATUS_NOT_ACCEPTED) return(ENOTSUP); + if (rval != NDIS_STATUS_SUCCESS) + return(ENODEV); + return(0); } @@ -1080,6 +1383,8 @@ ndis_flush_sysctls(sc); + ndis_shrink_thrqueue(8); + return(0); } @@ -1186,5 +1491,7 @@ block->nmb_dev = sc->ndis_dev; block->nmb_img = img; + ndis_enlarge_thrqueue(8); + return(0); } ==== //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#11 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.16 2004/01/16 02:07:04 obrien Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.18 2004/01/21 21:09:09 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -573,6 +573,110 @@ typedef struct ndis_80211_test ndis_80211_test; +/* TCP OIDs. */ + +#define OID_TCP_TASK_OFFLOAD 0xFC010201 +#define OID_TCP_TASK_IPSEC_ADD_SA 0xFC010202 +#define OID_TCP_TASK_IPSEC_DELETE_SA 0xFC010203 +#define OID_TCP_SAN_SUPPORT 0xFC010204 + + +#define NDIS_TASK_OFFLOAD_VERSION 1 + +#define NDIS_TASK_TCPIP_CSUM 0x00000000 +#define NDIS_TASK_IPSEC 0x00000001 +#define NDIS_TASK_TCP_LARGESEND 0x00000002 + +#define NDIS_ENCAP_UNSPEC 0x00000000 +#define NDIS_ENCAP_NULL 0x00000001 +#define NDIS_ENCAP_IEEE802_3 0x00000002 +#define NDIS_ENCAP_IEEE802_5 0x00000003 +#define NDIS_ENCAP_SNAP_ROUTED 0x00000004 +#define NDIS_ENCAP_SNAP_BRIDGED 0x00000005 + +#define NDIS_ENCAPFLAG_FIXEDHDRLEN 0x00000001 + +struct ndis_encap_fmt { + uint32_t nef_encap; + uint32_t nef_flags; + uint32_t nef_encaphdrlen; +}; + +typedef struct ndis_encap_fmt ndis_encap_fmt; + +struct ndis_task_offload_hdr { + uint32_t ntoh_vers; + uint32_t ntoh_len; + uint32_t ntoh_rsvd; + uint32_t ntoh_offset_firsttask; + ndis_encap_fmt ntoh_encapfmt; +}; + +typedef struct ndis_task_offload_hdr ndis_task_offload_hdr; + +struct ndis_task_offload { + uint32_t nto_vers; + uint32_t nto_len; + uint32_t nto_task; + uint32_t nto_offset_nexttask; + uint32_t nto_taskbuflen; + uint8_t nto_taskbuf[1]; +}; + +typedef struct ndis_task_offload ndis_task_offload; + +#define NDIS_TCPSUM_FLAGS_IP_OPTS 0x00000001 +#define NDIS_TCPSUM_FLAGS_TCP_OPTS 0x00000002 +#define NDIS_TCPSUM_FLAGS_TCP_CSUM 0x00000004 +#define NDIS_TCPSUM_FLAGS_UDP_CSUM 0x00000008 +#define NDIS_TCPSUM_FLAGS_IP_CSUM 0x00000010 + +struct ndis_task_tcpip_csum { + uint32_t nttc_v4tx; + uint32_t nttc_v4rx; + uint32_t nttc_v6tx; + uint32_t nttc_v6rx; +}; + +typedef struct ndis_task_tcpip_csum ndis_task_tcpip_csum; + +struct ndis_task_tcp_largesend { + uint32_t nttl_vers; + uint32_t nttl_maxofflen; + uint32_t nttl_minsegcnt; + uint8_t nttl_tcpopt; + uint8_t nttl_ipopt; +}; + +typedef struct ndis_task_tcp_largesend ndis_task_tcp_largesend; + +#define NDIS_IPSEC_AH_MD5 0x00000001 +#define NDIS_IPSEC_AH_SHA1 0x00000002 +#define NDIS_IPSEC_AH_TRANSPORT 0x00000004 +#define NDIS_IPSEC_AH_TUNNEL 0x00000008 +#define NDIS_IPSEC_AH_SEND 0x00000010 +#define NDIS_IPSEC_AH_RECEIVE 0x00000020 + +#define NDIS_IPSEC_ESP_DES 0x00000001 +#define NDIS_IPSEC_ESP_RSVD 0x00000002 +#define NDIS_IPSEC_ESP_3DES 0x00000004 +#define NDIS_IPSEC_ESP_NULL 0x00000008 +#define NDIS_IPSEC_ESP_TRANSPORT 0x00000010 +#define NDIS_IPSEC_ESP_TUNNEL 0x00000020 +#define NDIS_IPSEC_ESP_SEND 0x00000040 +#define NDIS_IPSEC_ESP_RECEIVE 0x00000080 + +struct ndis_task_ipsec { + uint32_t nti_ah_esp_combined; + uint32_t nti_ah_transport_tunnel_combined; + uint32_t nti_v4_options; + uint32_t nti_rsvd; + uint32_t nti_v4ah; + uint32_t nti_v4esp; +}; + +typedef struct ndis_task_ipsec ndis_task_ipsec; + /* * Attribures of NDIS drivers. Not all drivers support * all attributes. @@ -872,6 +976,43 @@ typedef struct ndis_sc_list ndis_sc_list; +struct ndis_tcpip_csum { + union { + uint32_t ntc_txflags; + uint32_t ntc_rxflags; + uint32_t ntc_val; + } u; +}; + +typedef struct ndis_tcpip_csum ndis_tcpip_csum; + +#define NDIS_TXCSUM_DO_IPV4 0x00000001 +#define NDIS_TXCSUM_DO_IPV6 0x00000002 +#define NDIS_TXCSUM_DO_TCP 0x00000004 +#define NDIS_TXCSUM_DO_UDP 0x00000008 +#define NDIS_TXCSUM_DO_IP 0x00000010 + +#define NDIS_RXCSUM_TCP_FAILED 0x00000001 +#define NDIS_RXCSUM_UDP_FAILED 0x00000002 +#define NDIS_RXCSUM_IP_FAILED 0x00000004 +#define NDIS_RXCSUM_TCP_PASSED 0x00000008 +#define NDIS_RXCSUM_UDP_PASSED 0x00000010 +#define NDIS_RXCSUM_IP_PASSED 0x00000020 +#define NDIS_RXCSUM_LOOPBACK 0x00000040 + +struct ndis_vlan { + union { + struct { + uint32_t nvt_userprio:3; + uint32_t nvt_canformatid:1; + uint32_t nvt_vlanid:12; + uint32_t nvt_rsvd:16; + } nv_taghdr; + } u; +}; + +typedef struct ndis_vlan ndis_vlan; + enum ndis_perpkt_info { ndis_tcpipcsum_info, ndis_ipsec_info, @@ -1321,6 +1462,9 @@ extern image_patch_table ndis_functbl[]; +#define NDIS_TASKQUEUE 1 +#define NDIS_SWI 2 + __BEGIN_DECLS extern int ndis_libinit(void); extern int ndis_libfini(void); @@ -1353,6 +1497,7 @@ extern int ndis_create_sysctls(void *); extern int ndis_add_sysctl(void *, char *, char *, char *, int); extern int ndis_flush_sysctls(void *); +extern int ndis_sched(void (*)(void *), void *, int); __END_DECLS #endif /* _NDIS_VAR_H_ */ ==== //depot/projects/netperf+sockets/sys/compat/ndis/ntoskrnl_var.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.5 2004/01/16 02:07:04 obrien Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.6 2004/01/19 20:45:27 wpaul Exp $ */ #ifndef _NTOSKRNL_VAR_H_ @@ -55,6 +55,13 @@ #define MDL_VA(b) \ ((void *)((char *)((b)->nb_startva) + (b)->nb_byteoffset)) +#define WDM_MAJOR 1 +#define WDM_MINOR_WIN98 0x00 +#define WDM_MINOR_WINME 0x05 +#define WDM_MINOR_WIN2000 0x10 +#define WDM_MINOR_WINXP 0x20 +#define WDM_MINOR_WIN2003 0x30 + /*- * The ndis_kspin_lock type is called KSPIN_LOCK in MS-Windows. * According to the Windows DDK header files, KSPIN_LOCK is defined like this: ==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.37 2004/01/15 07:42:26 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.38 2004/01/18 22:57:11 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -64,7 +64,6 @@ #include #include #include -#include #include #include #include @@ -261,7 +260,7 @@ __stdcall static void ndis_ind_statusdone(ndis_handle); __stdcall static void ndis_ind_status(ndis_handle, ndis_status, void *, uint32_t); -static void ndis_workfunc(void *, int); +static void ndis_workfunc(void *); __stdcall static ndis_status ndis_sched_workitem(ndis_work_item *); __stdcall static void ndis_pkt_to_pkt(ndis_packet *, uint32_t, uint32_t, ndis_packet *, uint32_t, uint32_t *); @@ -601,18 +600,18 @@ ndis_config_parm *parm; char *val; { - uint16_t *unicode; ndis_unicode_string *ustr; + char *astr = NULL; - unicode = (uint16_t *)&block->nmb_dummybuf; - switch(parm->ncp_type) { case ndis_parm_string: ustr = &parm->ncp_parmdata.ncp_stringdata; - ndis_unicode_to_ascii(ustr->nus_buf, ustr->nus_len, &val); + ndis_unicode_to_ascii(ustr->nus_buf, ustr->nus_len, &astr); + bcopy(astr, val, 254); + free(astr, M_DEVBUF); break; case ndis_parm_int: - sprintf(val, "%ul", parm->ncp_parmdata.ncp_intdata); + sprintf(val, "%d", parm->ncp_parmdata.ncp_intdata); break; case ndis_parm_hexint: sprintf(val, "%xu", parm->ncp_parmdata.ncp_intdata); @@ -644,6 +643,7 @@ ndis_unicode_to_ascii(key->nus_buf, key->nus_len, &keystr); /* Decode the parameter into a string. */ + bzero(val, sizeof(val)); *status = ndis_decode_parm(block, parm, val); if (*status != NDIS_STATUS_SUCCESS) { free(keystr, M_DEVBUF); @@ -2484,9 +2484,8 @@ } static void -ndis_workfunc(ctx, pending) +ndis_workfunc(ctx) void *ctx; - int pending; { ndis_work_item *work; __stdcall ndis_proc workfunc; @@ -2501,11 +2500,7 @@ ndis_sched_workitem(work) ndis_work_item *work; { - struct task *t; - - t = (struct task *)&work->nwi_wraprsvd; - TASK_INIT(t, 0, ndis_workfunc, work); - taskqueue_enqueue(taskqueue_swi, t); + ndis_sched(ndis_workfunc, work, NDIS_TASKQUEUE); return(NDIS_STATUS_SUCCESS); } ==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.17 2004/01/15 21:31:48 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.19 2004/01/19 19:57:00 wpaul Exp $"); #include #include @@ -75,7 +75,8 @@ ndis_ansi_string *, uint8_t); __stdcall static void *ntoskrnl_iobuildsynchfsdreq(uint32_t, void *, void *, uint32_t, uint32_t *, void *, void *); -__stdcall static uint32_t ntoskrnl_iofcalldriver(void *, void *); +__stdcall static uint32_t ntoskrnl_iofcalldriver(/*void *, void * */ void); +__stdcall static void ntoskrnl_iofcompletereq(/*void *, uint8_t*/ void); __stdcall static uint32_t ntoskrnl_waitforobj(void *, uint32_t, uint32_t, uint8_t, void *); __stdcall static void ntoskrnl_initevent(void *, uint32_t, uint8_t); @@ -129,6 +130,9 @@ __stdcall static void ntoskrnl_free_ansi_string(ndis_ansi_string *); __stdcall static ndis_status ntoskrnl_unicode_to_int(ndis_unicode_string *, uint32_t, uint32_t *); +static int atoi (const char *); +static long atol (const char *); +__stdcall static uint8_t ntoskrnl_wdmver(uint8_t, uint8_t); __stdcall static void dummy(void); static struct mtx *ntoskrnl_interlock; @@ -251,11 +255,25 @@ } __stdcall static uint32_t -ntoskrnl_iofcalldriver(dobj, irp) +ntoskrnl_iofcalldriver(/*dobj, irp*/) +{ void *dobj; void *irp; + + __asm__ __volatile__ ("" : "=c" (dobj), "=d" (irp)); + + return(0); +} + +__stdcall static void +ntoskrnl_iofcompletereq(/*irp, prioboost*/) { - return(0); + void *irp; + uint8_t prioboost; + + __asm__ __volatile__ ("" : "=c" (irp), "=d" (prioboost)); + + return; } __stdcall static uint32_t @@ -805,6 +823,30 @@ return; } +static int +atoi(str) + const char *str; +{ + return (int)strtol(str, (char **)NULL, 10); +} + +static long +atol(str) + const char *str; +{ + return strtol(str, (char **)NULL, 10); +} + +__stdcall static uint8_t +ntoskrnl_wdmver(major, minor) + uint8_t major; + uint8_t minor; +{ + if (major == WDM_MAJOR && minor == WDM_MINOR_WINXP) + return(TRUE); + return(FALSE); +} + __stdcall static void dummy() { @@ -825,6 +867,7 @@ { "RtlFreeUnicodeString", (FUNC)ntoskrnl_free_unicode_string }, { "RtlUnicodeStringToInteger", (FUNC)ntoskrnl_unicode_to_int }, >>> TRUNCATED FOR MAIL (1000 lines) <<<