Date: Thu, 7 Jun 2007 22:07:16 GMT From: Matt Jacob <mjacob@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 121179 for review Message-ID: <200706072207.l57M7GRs071897@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=121179 Change 121179 by mjacob@mjexp on 2007/06/07 22:07:14 IFC Affected files ... .. //depot/projects/mjexp/contrib/bind9/lib/isc/arm/include/isc/atomic.h#1 branch .. //depot/projects/mjexp/contrib/nvi/cl/cl_screen.c#2 integrate .. //depot/projects/mjexp/games/fortune/datfiles/fortunes#13 integrate .. //depot/projects/mjexp/lib/bind/config.mk#3 integrate .. //depot/projects/mjexp/lib/libc/net/getaddrinfo.3#2 integrate .. //depot/projects/mjexp/share/man/man4/axe.4#3 integrate .. //depot/projects/mjexp/share/man/man4/wlan.4#2 integrate .. //depot/projects/mjexp/share/man/man9/condvar.9#5 integrate .. //depot/projects/mjexp/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/mjexp/sys/amd64/amd64/genassym.c#7 integrate .. //depot/projects/mjexp/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/mjexp/sys/arm/include/pcpu.h#4 integrate .. //depot/projects/mjexp/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/mjexp/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/mjexp/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/mjexp/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath.c#13 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath_pci.c#5 integrate .. //depot/projects/mjexp/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/mjexp/sys/dev/ath/if_athrate.h#3 integrate .. //depot/projects/mjexp/sys/dev/ath/if_athvar.h#7 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bce.c#14 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bcereg.h#8 integrate .. //depot/projects/mjexp/sys/dev/de/if_de.c#3 integrate .. //depot/projects/mjexp/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/mjexp/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwdev.c#6 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwdma.c#3 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwohci_pci.c#6 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/mjexp/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/mjexp/sys/dev/firewire/if_fwevar.h#2 integrate .. //depot/projects/mjexp/sys/dev/firewire/if_fwip.c#5 integrate .. //depot/projects/mjexp/sys/dev/firewire/if_fwipvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/firewire/sbp.c#8 integrate .. //depot/projects/mjexp/sys/dev/firewire/sbp_targ.c#5 integrate .. //depot/projects/mjexp/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/mjexp/sys/dev/mii/brgphyreg.h#3 integrate .. //depot/projects/mjexp/sys/dev/mii/ciphy.c#4 integrate .. //depot/projects/mjexp/sys/dev/mii/ciphyreg.h#2 integrate .. //depot/projects/mjexp/sys/dev/mii/miidevs#9 integrate .. //depot/projects/mjexp/sys/dev/mii/rlphy.c#8 integrate .. //depot/projects/mjexp/sys/dev/puc/puc.c#3 integrate .. //depot/projects/mjexp/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97.c#9 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97_patch.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/ubsa.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/ums.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/uplcom.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/urio.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/usb.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/usb.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/mjexp/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/uvscom.c#4 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/mjexp/sys/geom/part/g_part.c#5 integrate .. //depot/projects/mjexp/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/mjexp/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/mjexp/sys/i386/i386/genassym.c#5 integrate .. //depot/projects/mjexp/sys/i386/i386/machdep.c#15 integrate .. //depot/projects/mjexp/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/mjexp/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/mjexp/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/mjexp/sys/ia64/ia64/pmap.c#10 integrate .. //depot/projects/mjexp/sys/kern/kern_mutex.c#11 integrate .. //depot/projects/mjexp/sys/kern/kern_thr.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_umtx.c#10 integrate .. //depot/projects/mjexp/sys/kern/sched_4bsd.c#11 integrate .. //depot/projects/mjexp/sys/kern/sched_ule.c#16 integrate .. //depot/projects/mjexp/sys/net80211/_ieee80211.h#6 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211.c#7 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_crypto.c#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_crypto.h#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_crypto_none.c#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_input.c#7 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_proto.c#6 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_xauth.c#2 integrate .. //depot/projects/mjexp/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.c#14 integrate .. //depot/projects/mjexp/sys/netinet/tcp_syncache.c#12 integrate .. //depot/projects/mjexp/sys/pc98/pc98/machdep.c#14 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/vm_machdep.c#4 integrate .. //depot/projects/mjexp/sys/sparc64/fhc/fhc.c#4 integrate .. //depot/projects/mjexp/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/mjexp/sys/sparc64/sbus/sbus.c#5 integrate .. //depot/projects/mjexp/sys/sys/mutex.h#11 integrate .. //depot/projects/mjexp/sys/sys/param.h#19 integrate .. //depot/projects/mjexp/sys/sys/pcpu.h#6 integrate .. //depot/projects/mjexp/sys/sys/proc.h#16 integrate .. //depot/projects/mjexp/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/mjexp/sys/sys/thr.h#3 integrate .. //depot/projects/mjexp/sys/sys/umtx.h#6 integrate .. //depot/projects/mjexp/usr.bin/gzip/gzip.1#4 integrate .. //depot/projects/mjexp/usr.sbin/boot0cfg/boot0cfg.8#3 integrate .. //depot/projects/mjexp/usr.sbin/dconschat/dconschat.c#3 integrate Differences ... ==== //depot/projects/mjexp/contrib/nvi/cl/cl_screen.c#2 (text+ko) ==== @@ -6,7 +6,7 @@ * * See the LICENSE file for redistribution information. * - * $FreeBSD: src/contrib/nvi/cl/cl_screen.c,v 1.2 2001/11/09 02:23:05 rwatson Exp $ + * $FreeBSD: src/contrib/nvi/cl/cl_screen.c,v 1.4 2007/06/06 11:14:30 rafan Exp $ */ #include "config.h" @@ -25,6 +25,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <term.h> #include <termios.h> #include <unistd.h> ==== //depot/projects/mjexp/games/fortune/datfiles/fortunes#13 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.239 2007/05/31 20:16:46 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.240 2007/06/06 11:12:56 ceri Exp $ % ======================================================================= @@ -27058,7 +27058,7 @@ have let me in on it by now. I contribute enough to the shule. -- Saul Goodman % -If there was in justice in the world, "trust" would be a four-letter word. +If there was any justice in the world, "trust" would be a four-letter word. % If there were a school for, say, sheet metal workers, that after three years left its graduates as unprepared for their careers as does law ==== //depot/projects/mjexp/lib/bind/config.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/config.mk,v 1.18 2007/06/03 16:49:57 dougb Exp $ +# $FreeBSD: src/lib/bind/config.mk,v 1.19 2007/06/05 22:17:16 dougb Exp $ .include <bsd.own.mk> @@ -65,8 +65,6 @@ # Use the right version of the atomic.h file from lib/isc .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" ISC_ATOMIC_ARCH= x86_32 -.elif ${MACHINE_ARCH} == "arm" -ISC_ATOMIC_ARCH= noatomic .else ISC_ATOMIC_ARCH= ${MACHINE_ARCH} .endif ==== //depot/projects/mjexp/lib/libc/net/getaddrinfo.3#2 (text+ko) ==== @@ -16,9 +16,9 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.32 2005/06/15 19:04:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.33 2007/06/06 19:24:02 remko Exp $ .\" -.Dd December 20, 2004 +.Dd June 6, 2007 .Dt GETADDRINFO 3 .Os .Sh NAME @@ -119,11 +119,41 @@ .Fa ai_protocol is zero the caller will accept any protocol. .It Fa ai_flags +The .Fa ai_flags -is formed by -.Tn OR Ns 'ing -the following values: +field to which the +.Fa hints +parameter points shall be set to zero +or be the bitwise-inclusive OR of one or more of the values +.Dv AI_ADDRCONFIG , +.Dv AI_ALL , +.Dv AI_CANONNAME , +.Dv AI_NUMERICHOST , +.Dv AI_NUMERICSERV , +.Dv AI_PASSIVE , +and +.Dv AI_V4MAPPED . .Bl -tag -width "AI_CANONNAMEXX" +.It Dv AI_ADDRCONFIG +If the +.Dv AI_ADDRCONFIG +bit is set, IPv4 addresses shall be returned only if +an IPv4 address is configured on the local system, +and IPv6 addresses shall be returned only if +an IPv6 address is configured on the local system. +.It Dv AI_ALL +If the +.Dv AI_ALL +bit is set with the +.Dv AI_V4MAPPED +bit, then +.Fn getaddrinfo +shall return all matching IPv6 and IPv4 addresses. +The +.Dv AI_ALL +bit without the +.Dv AI_V4MAPPED +bit is ignored. .It Dv AI_CANONNAME If the .Dv AI_CANONNAME @@ -142,6 +172,18 @@ .Fa hostname should be treated as a numeric string defining an IPv4 or IPv6 address and no name resolution should be attempted. +.It Dv AI_NUMERICSERV +If the +.Dv AI_NUMERICSERV +bit is set, +then a non-null +.Fa servname +string supplied shall be a numeric port string. +Otherwise, an +.Dv EAI_NONAME +error shall be returned. +This bit shall prevent any type of name resolution service +(for example, NIS+) from being invoked. .It Dv AI_PASSIVE If the .Dv AI_PASSIVE @@ -176,6 +218,25 @@ is the null pointer and .Dv AI_PASSIVE is not set. +.It Dv AI_V4MAPPED +If the +.Dv AI_V4MAPPED +flag is specified along with an +.Fa ai_family +of +.Dv AF_INET6 , +then +.Fn getaddrinfo +shall return IPv4-mapped IPv6 addresses +on finding no matching IPv6 addresses ( +.Fa ai_addrlen +shall be 16). +The +.Dv AI_V4MAPPED +flag shall be ignored unless +.Fa ai_family +equals +.Dv AF_INET6 . .El .El .Pp @@ -428,7 +489,7 @@ The .Fn getaddrinfo function is defined by the -.St -p1003.1g-2000 -draft specification and documented in +.St -p1003.1-2004 +specification and documented in .Dv "RFC 3493" , .Dq Basic Socket Interface Extensions for IPv6 . ==== //depot/projects/mjexp/share/man/man4/axe.4#3 (text+ko) ==== @@ -28,9 +28,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/axe.4,v 1.13 2007/05/12 05:59:15 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/axe.4,v 1.14 2007/06/06 19:27:10 remko Exp $ .\" -.Dd May 12, 2007 +.Dd June 6, 2007 .Dt AXE 4 .Os .Sh NAME @@ -134,7 +134,7 @@ .It Buffalo (Melco Inc.) LUA-U2-KTX .It -D-Link DUBE100 +D-Link DUB-E100, revision A .It LinkSys USB200M .It ==== //depot/projects/mjexp/share/man/man4/wlan.4#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/share/man/man4/wlan.4,v 1.10 2005/11/26 00:47:07 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.11 2007/06/06 07:58:03 kevlo Exp $ .\" .Dd November 26, 2005 .Dt WLAN 4 @@ -48,6 +48,7 @@ .Xr ipw 4 , .Xr iwi 4 , .Xr ral 4 , +.Xr rum 4 , .Xr ural 4 , and .Xr wi 4 @@ -125,6 +126,7 @@ .Xr iwi 4 , .Xr netintro 4 , .Xr ral 4 , +.Xr rum 4 , .Xr ural 4 , .Xr wi 4 , .Xr wlan_acl 4 , ==== //depot/projects/mjexp/share/man/man9/condvar.9#5 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/condvar.9,v 1.19 2007/03/30 18:07:26 julian Exp $ +.\" $FreeBSD: src/share/man/man9/condvar.9,v 1.21 2007/06/05 20:53:18 imp Exp $ .\" -.Dd March 21, 2007 +.Dd June 5, 2007 .Dt CONDVAR 9 .Os .Sh NAME @@ -117,6 +117,12 @@ or .Xr sx 9 lock. +A +.Xr mutex 9 +argument must be initialized with +.Dv MTX_DEF +and not +.Dv MTX_SPIN . A thread must hold .Fa lock before calling ==== //depot/projects/mjexp/sys/amd64/amd64/cpu_switch.S#5 (text+ko) ==== @@ -30,7 +30,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.157 2007/06/05 00:16:43 jeff Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.158 2007/06/06 07:35:07 davidxu Exp $ */ #include <machine/asmacros.h> @@ -203,9 +203,7 @@ movq %rbx, (%rax) movq %rbx, PCPU(RSP0) - movl TD_TID(%rsi), %eax movq %r8, PCPU(CURPCB) - movl %eax, PCPU(CURTID) movq %rsi, PCPU(CURTHREAD) /* into next thread */ testl $PCB_32BIT,PCB_FLAGS(%r8) ==== //depot/projects/mjexp/sys/amd64/amd64/genassym.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.162 2007/06/05 00:13:49 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.163 2007/06/06 07:35:07 davidxu Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -194,7 +194,6 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); -ASSYM(PC_CURTID, offsetof(struct pcpu, pc_curtid)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/mjexp/sys/amd64/amd64/machdep.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.674 2007/06/05 00:00:49 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.675 2007/06/06 07:35:07 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1179,7 +1179,6 @@ PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); - PCPU_SET(curtid, thread0.td_tid); PCPU_SET(tssp, &common_tss[0]); /* ==== //depot/projects/mjexp/sys/arm/include/pcpu.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27 - * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.5 2007/06/04 21:38:45 attilio Exp $ + * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.6 2007/06/06 23:23:47 jeff Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -58,7 +58,7 @@ * with respect to preemption. */ #define PCPU_ADD(member, value) (__pcpu.pc_ ## member += (value)) -#define PCPU_INC(member) PCPU_LAZY_ADD(member, 1) +#define PCPU_INC(member) PCPU_ADD(member, 1) #define PCPU_PTR(member) (&__pcpu.pc_ ## member) #define PCPU_SET(member,value) (__pcpu.pc_ ## member = (value)) ==== //depot/projects/mjexp/sys/dev/ath/ah_osdep.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ah_osdep.c,v 1.2 2007/04/10 15:48:45 rwatson Exp $ + * $FreeBSD: src/sys/dev/ath/ah_osdep.c,v 1.3 2007/06/06 15:49:15 sam Exp $ */ #include "opt_ah.h" ==== //depot/projects/mjexp/sys/dev/ath/ah_osdep.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ah_osdep.h,v 1.1 2006/09/18 16:49:14 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ah_osdep.h,v 1.2 2007/06/06 15:49:15 sam Exp $ */ #ifndef _ATH_AH_OSDEP_H_ #define _ATH_AH_OSDEP_H_ ==== //depot/projects/mjexp/sys/dev/ath/ath_rate/onoe/onoe.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.12 2006/12/13 19:34:35 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.13 2007/06/06 15:49:16 sam Exp $"); /* * Atsushi Onoe's rate control algorithm. ==== //depot/projects/mjexp/sys/dev/ath/ath_rate/onoe/onoe.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -7,19 +7,12 @@ * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer, - without modification. + * without modification. * 2. Redistributions in binary form must reproduce at minimum a disclaimer * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.h,v 1.2 2004/12/31 22:41:45 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.h,v 1.3 2007/06/06 15:49:16 sam Exp $ */ /* ==== //depot/projects/mjexp/sys/dev/ath/if_ath.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.169 2007/06/03 02:16:48 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.170 2007/06/06 15:49:15 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. ==== //depot/projects/mjexp/sys/dev/ath/if_ath_pci.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.18 2007/02/23 12:18:33 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.19 2007/06/06 15:49:15 sam Exp $"); /* * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver. ==== //depot/projects/mjexp/sys/dev/ath/if_athioctl.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.17 2006/08/10 16:31:37 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.18 2007/06/06 15:49:15 sam Exp $ */ /* ==== //depot/projects/mjexp/sys/dev/ath/if_athrate.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2004-2007 Sam Leffler, Errno Consulting * Copyright (c) 2004 Video54 Technologies, Inc. * All rights reserved. * @@ -8,19 +8,12 @@ * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer, - without modification. + * without modification. * 2. Redistributions in binary form must reproduce at minimum a disclaimer * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -34,7 +27,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athrate.h,v 1.5 2006/12/13 19:34:34 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athrate.h,v 1.6 2007/06/06 15:49:15 sam Exp $ */ #ifndef _ATH_RATECTRL_H_ #define _ATH_RATECTRL_H_ ==== //depot/projects/mjexp/sys/dev/ath/if_athvar.h#7 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.60 2007/03/05 21:56:33 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.61 2007/06/06 15:49:15 sam Exp $ */ /* ==== //depot/projects/mjexp/sys/dev/bce/if_bce.c#14 (text) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.31 2007/05/16 23:34:11 davidch Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.32 2007/06/07 02:23:56 davidch Exp $"); /* * The following controllers are supported by this driver: @@ -109,7 +109,7 @@ /* BCM5708S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM5708S 1000Base-T" }, + "Broadcom NetXtreme II BCM5708 1000Base-SX" }, { 0, 0, 0, 0, NULL } }; @@ -359,25 +359,25 @@ DRIVER_MODULE(bce, pci, bce_driver, bce_devclass, 0, 0); DRIVER_MODULE(miibus, bce, miibus_driver, miibus_devclass, 0, 0); - - + + /****************************************************************************/ /* Tunable device values */ /****************************************************************************/ -static int bce_tso_enable = TRUE; +static int bce_tso_enable = TRUE; static int bce_msi_enable = 1; - -/* Allowable values are TRUE or FALSE */ -TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable); + +/* Allowable values are TRUE or FALSE */ +TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable); /* Allowable values are 0 (IRQ only) and 1 (IRQ or MSI) */ TUNABLE_INT("hw.bce.msi_enable", &bce_msi_enable); -SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters"); -SYSCTL_UINT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0, +SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters"); +SYSCTL_UINT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0, "TSO Enable/Disable"); -SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0, +SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0, "MSI | INTx selector"); - + /****************************************************************************/ /* Device probe function. */ /* */ @@ -468,7 +468,7 @@ DBPRINT(sc, BCE_VERBOSE_RESET, "Entering %s()\n", __FUNCTION__); mbuf = device_get_unit(dev); - + /* Set initial device and PHY flags */ sc->bce_flags = 0; sc->bce_phy_flags = 0; @@ -494,19 +494,19 @@ sc->bce_bhandle = rman_get_bushandle(sc->bce_res_mem); sc->bce_vhandle = (vm_offset_t) rman_get_virtual(sc->bce_res_mem); - /* If MSI is enabled in the driver, get the vector count. */ - count = bce_msi_enable ? pci_msi_count(dev) : 0; - + /* If MSI is enabled in the driver, get the vector count. */ + count = bce_msi_enable ? pci_msi_count(dev) : 0; + /* Allocate PCI IRQ resources. */ if (count == 1 && pci_alloc_msi(dev, &count) == 0 && count == 1) { rid = 1; sc->bce_flags |= BCE_USING_MSI_FLAG; DBPRINT(sc, BCE_INFO, "Allocating %d MSI interrupt(s).\n", count); } else { - rid = 0; + rid = 0; DBPRINT(sc, BCE_INFO, "Allocating IRQ interrupt.\n"); } - + sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE); @@ -632,7 +632,7 @@ /* Initialize the controller. */ if (bce_chipinit(sc)) { BCE_PRINTF("%s(%d): Controller initialization failed!\n", - __FILE__, __LINE__); + __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; } @@ -684,25 +684,33 @@ sc->bce_stats_ticks = 1000000 & 0xffff00; /* - * The copper based NetXtreme II controllers - * use an integrated PHY at address 1 while - * the SerDes controllers use a PHY at - * address 2. + * The SerDes based NetXtreme II controllers + * that support 2.5Gb operation (currently + * 5708S) use a PHY at address 2, otherwise + * the PHY is present at address 1. */ sc->bce_phy_addr = 1; if (BCE_CHIP_BOND_ID(sc) & BCE_CHIP_BOND_ID_SERDES_BIT) { sc->bce_phy_flags |= BCE_PHY_SERDES_FLAG; sc->bce_flags |= BCE_NO_WOL_FLAG; - if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5708) { + if (BCE_CHIP_NUM(sc) != BCE_CHIP_NUM_5706) { sc->bce_phy_addr = 2; val = REG_RD_IND(sc, sc->bce_shmem_base + BCE_SHARED_HW_CFG_CONFIG); - if (val & BCE_SHARED_HW_CFG_PHY_2_5G) + if (val & BCE_SHARED_HW_CFG_PHY_2_5G) { sc->bce_phy_flags |= BCE_PHY_2_5G_CAPABLE_FLAG; + DBPRINT(sc, BCE_WARN, "Found 2.5Gb capable adapter\n"); + } } } + /* Store config data needed by the PHY driver for backplane applications */ + sc->bce_shared_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + + BCE_SHARED_HW_CFG_CONFIG); + sc->bce_port_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + + BCE_SHARED_HW_CFG_CONFIG); + /* Allocate DMA memory resources. */ if (bce_dma_alloc(dev)) { BCE_PRINTF("%s(%d): DMA resource allocation failed!\n", @@ -728,14 +736,14 @@ ifp->if_start = bce_start; ifp->if_init = bce_init; ifp->if_mtu = ETHERMTU; - - if (bce_tso_enable) { - ifp->if_hwassist = BCE_IF_HWASSIST | CSUM_TSO; + + if (bce_tso_enable) { + ifp->if_hwassist = BCE_IF_HWASSIST | CSUM_TSO; ifp->if_capabilities = BCE_IF_CAPABILITIES | IFCAP_TSO4; - } else { - ifp->if_hwassist = BCE_IF_HWASSIST; - ifp->if_capabilities = BCE_IF_CAPABILITIES; - } + } else { + ifp->if_hwassist = BCE_IF_HWASSIST; + ifp->if_capabilities = BCE_IF_CAPABILITIES; + } ifp->if_capenable = ifp->if_capabilities; @@ -747,9 +755,9 @@ ifp->if_snd.ifq_drv_maxlen = USABLE_TX_BD; if (sc->bce_phy_flags & BCE_PHY_2_5G_CAPABLE_FLAG) - ifp->if_baudrate = IF_Gbps(2.5); + ifp->if_baudrate = IF_Mbps(2500ULL); else - ifp->if_baudrate = IF_Gbps(1); + ifp->if_baudrate = IF_Mbps(1000); IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen); IFQ_SET_READY(&ifp->if_snd); @@ -792,7 +800,7 @@ /* Get the firmware running so IPMI still works */ BCE_LOCK(sc); bce_mgmt_init_locked(sc); - BCE_UNLOCK(sc); + BCE_UNLOCK(sc); goto bce_attach_exit; @@ -1047,7 +1055,7 @@ /* Make sure we are accessing the correct PHY address. */ if (phy != sc->bce_phy_addr) { - DBPRINT(sc, BCE_WARN, "Invalid PHY address %d for PHY write!\n", phy); + DBPRINT(sc, BCE_VERBOSE, "Invalid PHY address %d for PHY write!\n", phy); return(0); } @@ -1111,71 +1119,61 @@ { struct bce_softc *sc; struct mii_data *mii; + int val; sc = device_get_softc(dev); mii = device_get_softc(sc->bce_miibus); - DBPRINT(sc, BCE_INFO, "mii_media_active = 0x%08X\n", - mii->mii_media_active); - -#ifdef BCE_DEBUG - /* Decode the interface media flags. */ - BCE_PRINTF("Media: ( "); - switch(IFM_TYPE(mii->mii_media_active)) { - case IFM_ETHER: printf("Ethernet )"); - break; - default: printf("Unknown )"); - } - - printf(" Media Options: ( "); - switch(IFM_SUBTYPE(mii->mii_media_active)) { - case IFM_AUTO: printf("Autoselect )"); break; - case IFM_MANUAL: printf("Manual )"); break; - case IFM_NONE: printf("None )"); break; - case IFM_10_T: printf("10Base-T )"); break; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706072207.l57M7GRs071897>