PERFORCE change 169824 for review
Alexander Motin
mav at FreeBSD.org
Mon Oct 26 11:57:20 UTC 2009
http://p4web.freebsd.org/chv.cgi?CH=169824
Change 169824 by mav at mav_mavtest on 2009/10/26 11:57:06
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#17 integrate
.. //depot/projects/scottl-camlock/src/UPDATING#19 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/expand.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/sh.1#7 integrate
.. //depot/projects/scottl-camlock/src/gnu/lib/libgcov/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libthr/arch/ia64/Makefile.inc#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libthr/arch/ia64/ia64/_umtx_op_err.S#1 branch
.. //depot/projects/scottl-camlock/src/lib/libthr/arch/ia64/include/pthread_md.h#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/part/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/part/geom_part.c#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/acpi_hp.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/acpi_wmi.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/bge.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/iwn.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/iwnfw.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/msk.4#5 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#38 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#51 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-nvidia.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-via.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/msk/if_mskreg.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_vfsops.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#18 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/param.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_thread.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sysv_shm.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/Makefile.inc#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn4965/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn5000/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn5150/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/netgraph/NOTES#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/hid.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/hrowpic.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/cpu.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/tools/fw_stub.awk#5 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#23 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/question1.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/set-u1.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/set-u2.0#1 branch
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/cdrom.c#3 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#17 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.210 2009/10/12 21:10:28 markm Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.211 2009/10/24 12:59:29 antoine Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,9 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20091005: fusword.9 and susword.9 removed
+OLD_FILES+=usr/share/man/man9/fusword.9.gz
+OLD_FILES+=usr/share/man/man9/susword.9.gz
# 20090909: vesa and dpms promoted to be i386/amd64 common
OLD_FILES+=usr/include/machine/pc/vesa.h
OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz
@@ -26,6 +29,49 @@
OLD_FILES+=etc/mtree/BSD.local.dist
OLD_FILES+=etc/mtree/BSD.x11.dist
OLD_FILES+=etc/mtree/BSD.x11-4.dist
+# 20090812: net80211 documentation overhaul
+OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz
# 20090801: vimage.h removed in favour of vnet.h
OLD_FILES+=usr/include/sys/vimage.h
# 20090719: library version bump for 8.0
==== //depot/projects/scottl-camlock/src/UPDATING#19 (text+ko) ====
@@ -22,6 +22,14 @@
machines to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20091025:
+ The iwn(4) driver has been updated to support the 5000 and 5150 series.
+ There's one kernel module for each firmware. Adding "device iwnfw"
+ to the kernel configuration file means including all three firmware
+ images inside the kernel. If you want to include just the one for
+ your wireless card, use the the devices iwn4965fw, iwn5000fw or
+ iwn5150fw.
+
20090926:
The rc.d/network_ipv6, IPv6 configuration script has been integrated
into rc.d/netif. The changes are the following:
@@ -624,6 +632,15 @@
userland (libpmc(3)) and the kernel module (hwpmc(4)) in
sync.
+20081009:
+ atapci kernel module now includes only generic PCI ATA
+ driver. AHCI driver moved to ataahci kernel module.
+ All vendor-specific code moved into separate kernel modules:
+ ataacard, ataacerlabs, ataadaptec, ataamd, ataati, atacenatek,
+ atacypress, atacyrix, atahighpoint, ataintel, ataite, atajmicron,
+ atamarvell, atamicron, atanational, atanetcell, atanvidia,
+ atapromise, ataserverworks, atasiliconimage, atasis, atavia
+
20080820:
The TTY subsystem of the kernel has been replaced by a new
implementation, which provides better scalability and an
@@ -1030,4 +1047,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.641 2009/09/26 18:59:00 hrs Exp $
+$FreeBSD: src/UPDATING,v 1.643 2009/10/26 09:16:08 mav Exp $
==== //depot/projects/scottl-camlock/src/bin/sh/expand.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.55 2009/06/25 17:14:06 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.56 2009/10/24 21:20:04 jilles Exp $");
#include <sys/types.h>
#include <sys/time.h>
@@ -657,7 +657,7 @@
}
varlen = 0;
startloc = expdest - stackblock();
- if (!set && uflag) {
+ if (!set && uflag && *var != '@' && *var != '*') {
switch (subtype) {
case VSNORMAL:
case VSTRIMLEFT:
==== //depot/projects/scottl-camlock/src/bin/sh/sh.1#7 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.132 2009/10/07 22:21:53 jilles Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.133 2009/10/24 21:20:04 jilles Exp $
.\"
-.Dd May 31, 2009
+.Dd October 24, 2009
.Dt SH 1
.Os
.Sh NAME
@@ -296,7 +296,10 @@
.Ed
.It Fl u Li nounset
Write a message to standard error when attempting
-to expand a variable that is not set, and if the
+to expand a variable, a positional parameter or
+the special parameter
+.Va \&!
+that is not set, and if the
shell is not interactive, exit immediately.
.It Fl V Li vi
Enable the built-in
==== //depot/projects/scottl-camlock/src/gnu/lib/libgcov/Makefile#4 (text+ko) ====
@@ -1,7 +1,8 @@
-# $FreeBSD: src/gnu/lib/libgcov/Makefile,v 1.6 2009/06/21 01:54:47 kan Exp $
+# $FreeBSD: src/gnu/lib/libgcov/Makefile,v 1.7 2009/10/25 15:52:31 kan Exp $
NO_PROFILE=
.include <bsd.own.mk>
+MK_SSP= no
.include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
GCCDIR= ${.CURDIR}/../../../contrib/gcc
==== //depot/projects/scottl-camlock/src/lib/libthr/arch/ia64/Makefile.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/lib/libthr/arch/ia64/Makefile.inc,v 1.3 2008/02/13 05:25:43 obrien Exp $
+# $FreeBSD: src/lib/libthr/arch/ia64/Makefile.inc,v 1.4 2009/10/24 20:07:17 marcel Exp $
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
-SRCS+= pthread_md.c
+SRCS+= _umtx_op_err.S pthread_md.c
==== //depot/projects/scottl-camlock/src/lib/libthr/arch/ia64/include/pthread_md.h#2 (text+ko) ====
@@ -23,7 +23,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/lib/libthr/arch/ia64/include/pthread_md.h,v 1.4 2006/12/15 11:52:00 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/arch/ia64/include/pthread_md.h,v 1.5 2009/10/24 20:07:17 marcel Exp $
*/
#ifndef _PTHREAD_MD_H_
@@ -33,6 +33,8 @@
#define CPU_SPINWAIT
+#define HAS__UMTX_OP_ERR 1
+
#define DTV_OFFSET offsetof(struct tcb, tcb_dtv)
/*
==== //depot/projects/scottl-camlock/src/sbin/geom/class/part/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sbin/geom/class/part/Makefile,v 1.2 2008/11/18 04:04:01 marcel Exp $
+# $FreeBSD: src/sbin/geom/class/part/Makefile,v 1.3 2009/10/26 07:43:41 lulf Exp $
.PATH: ${.CURDIR}/../../misc
@@ -6,6 +6,4 @@
LDADD= -lutil
-WARNS?= 4
-
.include <bsd.lib.mk>
==== //depot/projects/scottl-camlock/src/sbin/geom/class/part/geom_part.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.21 2009/08/16 21:27:35 marcel Exp $");
+__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.22 2009/10/26 07:43:41 lulf Exp $");
#include <sys/stat.h>
@@ -192,6 +192,7 @@
unsigned long long sector, bestsector;
bestpp = NULL;
+ bestsector = 0;
LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
s = find_provcfg(pp, "start");
if (s == NULL) {
==== //depot/projects/scottl-camlock/src/share/man/man4/acpi_hp.4#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/acpi_hp.4,v 1.4 2009/07/03 21:12:37 rpaulo Exp $
+.\" $FreeBSD: src/share/man/man4/acpi_hp.4,v 1.5 2009/10/24 11:32:02 rpaulo Exp $
.\"
.Dd June 30, 2009
.Dt ACPI_HP 4 i386
@@ -256,7 +256,7 @@
The
.Nm
device driver first appeared in
-.Fx CURRENT .
+.Fx 8.0 .
.Sh AUTHORS
.An -nosplit
The
@@ -279,7 +279,7 @@
This manual page was written by
.An Michael Gmelin Aq freebsd at grem.de
.Sh BUGS
-This driver is experimental and has only been tested on CURRENT i386 on an
+This driver is experimental and has only been tested on i386 on an
HP Compaq 8510p which featured all supported wireless devices (WWAN/BT/WLAN).
Expect undefined results when operating on different hardware.
.Pp
==== //depot/projects/scottl-camlock/src/share/man/man4/acpi_wmi.4#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/acpi_wmi.4,v 1.3 2009/07/03 21:12:37 rpaulo Exp $
+.\" $FreeBSD: src/share/man/man4/acpi_wmi.4,v 1.4 2009/10/24 11:32:02 rpaulo Exp $
.\"
.Dd June 30, 2009
.Dt ACPI_WMI 4 i386
@@ -79,7 +79,7 @@
The
.Nm
device driver first appeared in
-.Fx CURRENT .
+.Fx 8.0 .
.Sh AUTHORS
.An -nosplit
The
==== //depot/projects/scottl-camlock/src/share/man/man4/bge.4#4 (text+ko) ====
@@ -29,9 +29,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/bge.4,v 1.36 2009/10/07 13:25:24 stas Exp $
+.\" $FreeBSD: src/share/man/man4/bge.4,v 1.37 2009/10/25 17:47:52 brueffer Exp $
.\"
-.Dd Oct 7, 2009
+.Dd October 7, 2009
.Dt BGE 4
.Os
.Sh NAME
==== //depot/projects/scottl-camlock/src/share/man/man4/iwn.4#3 (text+ko) ====
@@ -23,38 +23,54 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.5 2009/06/10 03:28:34 sam Exp $
+.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.6 2009/10/25 11:01:53 rpaulo Exp $
.\"
-.Dd April 13, 2008
+.Dd October 25, 2009
.Os
.Dt IWN 4
.Sh NAME
.Nm iwn
-.Nd "Intel Wireless WiFi Link 4965AGN IEEE 802.11n driver"
+.Nd "Intel Wireless WiFi Link 4965/5000 IEEE 802.11n driver"
.Sh SYNOPSIS
To compile this driver into the kernel,
include the following lines in your
kernel configuration file:
.Bd -ragged -offset indent
.Cd "device iwn"
-.Cd "device iwnfw"
.Cd "device pci"
.Cd "device wlan"
.Cd "device firmware"
.Ed
.Pp
+You also need to select a firmware for your device. Chose one from:
+.Bd -ragged -offset indent
+.Cd "device iwn4965fw"
+.Cd "device iwn5000fw"
+.Cd "device iwn5100fw"
+.Ed
+.Pp
+Or you can use
+.Bd -ragged -offset indent
+.Cd "device iwnfw"
+.Ed
+.Pp
+to include them all.
+.Pp
Alternatively, to load the driver as a
module at boot time, place the following line in
.Xr loader.conf 5 :
.Bd -literal -offset indent
if_iwn_load="YES"
+iwn4965fw_load="YES"
+iwn5000fw_load="YES"
+iwn5100fw_load="YES"
.Ed
.Sh DESCRIPTION
The
.Nm
driver provides support for
.Tn Intel
-Wireless WiFi Link 4965AGN PCI-Express network adapters.
+Wireless WiFi Link 4965 and 5000 series of PCI-Express network adapters.
.Nm
supports
.Cm station ,
==== //depot/projects/scottl-camlock/src/share/man/man4/iwnfw.4#2 (text+ko) ====
@@ -20,9 +20,9 @@
.\" (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/share/man/man4/iwnfw.4,v 1.1 2009/05/09 19:19:19 sam Exp $
+.\" $FreeBSD: src/share/man/man4/iwnfw.4,v 1.2 2009/10/25 11:01:53 rpaulo Exp $
.\"
-.Dd May 9, 2009
+.Dd October 25, 2009
.Dt IWNFW 4
.Os
.Sh NAME
@@ -36,15 +36,26 @@
.Cd "device iwnfw"
.Ed
.Pp
+This will include three firmware images inside the kernel.
+If you want to pick only the firmware image for your network adapter choose one
+of the following:
+.Bd -ragged -offset indent
+.Cd "device iwn4965fw"
+.Cd "device iwn5000fw"
+.Cd "device iwn5100fw"
+.Ed
+.Pp
Alternatively, to load the driver as a
module at boot time, place the following line in
.Xr loader.conf 5 :
.Bd -literal -offset indent
-iwnfw_load="YES"
+iwn4965fw_load="YES"
+iwn5000fw_load="YES"
+iwn5100fw_load="YES"
.Ed
.Sh DESCRIPTION
This module provides access to firmware sets for the
-Intel Wireless WiFi Link 4965AGN IEEE 802.11n adapters.
+Intel Wireless WiFi Link 4965 and 5000 series of IEEE 802.11n adapters.
It may be
statically linked into the kernel, or loaded as a module.
.Sh SEE ALSO
==== //depot/projects/scottl-camlock/src/share/man/man4/msk.4#5 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/msk.4,v 1.10 2009/09/28 21:15:57 yongari Exp $
+.\" $FreeBSD: src/share/man/man4/msk.4,v 1.11 2009/10/25 21:46:38 lulf Exp $
.\"
.Dd September 28, 2009
.Dt MSK 4
@@ -190,6 +190,8 @@
.It
Marvell Yukon 88E8040T Fast Ethernet
.It
+Marvell Yukon 88E8042 Fast Ethernet
+.It
Marvell Yukon 88E8048 Fast Ethernet
.It
Marvell Yukon 88E8050 Gigabit Ethernet
==== //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#20 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.101 2009/08/01 19:26:27 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.102 2009/10/25 09:58:56 bz Exp $");
/* XXX we use functions that might not exist. */
#include "opt_compat.h"
@@ -639,19 +639,12 @@
}
#ifdef INET6
/*
- * Linux AF_INET6 socket has IPV6_V6ONLY setsockopt set to 0 by
- * default and some apps depend on this. So, set V6ONLY to 0
- * for Linux apps if the sysctl value is set to 1.
+ * Linux AF_INET6 socket has IPV6_V6ONLY setsockopt set to 0 by default
+ * and some apps depend on this. So, set V6ONLY to 0 for Linux apps.
+ * For simplicity we do this unconditionally of the net.inet6.ip6.v6only
+ * sysctl value.
*/
- if (bsd_args.domain == PF_INET6
-#ifndef KLD_MODULE
- /*
- * XXX: Avoid undefined symbol error with an IPv4 only
- * kernel.
- */
- && V_ip6_v6only
-#endif
- ) {
+ if (bsd_args.domain == PF_INET6) {
int v6only;
v6only = 0;
==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#38 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1558 2009/10/21 12:47:09 stas Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1559 2009/10/26 10:35:16 mav Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1657,6 +1657,10 @@
# The 'ATA' driver supports all ATA and ATAPI devices, including PC Card
# devices. You only need one "device ata" for it to find all
# PCI and PC Card ATA/ATAPI devices on modern machines.
+# Alternatively, individual bus and chipset drivers may be chosen by using
+# the 'atacore' driver then selecting the drivers on a per vendor basis.
+# For example to build a system which only supports a VIA chipset,
+# omit 'ata' and include the 'atacore', 'atapci' and 'atavia' drivers.
device ata
device atadisk # ATA disk drives
device ataraid # ATA RAID drives
@@ -1665,6 +1669,39 @@
device atapist # ATAPI tape drives
device atapicam # emulate ATAPI devices as SCSI ditto via CAM
# needs CAM to be present (scbus & pass)
+
+# Modular ATA
+#device atacore # Core ATA functionality
+#device atacard # CARDBUS support
+#device atabus # PC98 cbus support
+#device ataisa # ISA bus support
+#device atapci # PCI bus support; only generic chipset support
+
+# PCI ATA chipsets
+#device ataahci # AHCI SATA
+#device ataacard # ACARD
+#device ataacerlabs # Acer Labs Inc. (ALI)
+#device ataadaptec # Adaptec
+#device ataamd # American Micro Devices (AMD)
+#device ataati # ATI
+#device atacenatek # Cenatek
+#device atacypress # Cypress
+#device atacyrix # Cyrix
+#device atahighpoint # HighPoint
+#device ataintel # Intel
+#device ataite # Integrated Technology Inc. (ITE)
+#device atajmicron # JMicron
+#device atamarvell # Marvell
+#device atamicron # Micron
+#device atanational # National
+#device atanetcell # NetCell
+#device atanvidia # nVidia
+#device atapromise # Promise
+#device ataserverworks # ServerWorks
+#device atasiliconimage # Silicon Image Inc. (SiI) (formerly CMD)
+#device atasis # Silicon Integrated Systems Corp.(SiS)
+#device atavia # VIA Technologies Inc.
+
#
# For older non-PCI, non-PnPBIOS systems, these are the hints lines to add:
hint.ata.0.at="isa"
==== //depot/projects/scottl-camlock/src/sys/conf/files#51 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1478 2009/10/23 12:36:42 mav Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1479 2009/10/25 10:23:11 rpaulo Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -1082,20 +1082,48 @@
no-obj no-implicit-rule \
clean "iwi_monitor.fw"
dev/iwn/if_iwn.c optional iwn
-iwnfw.c optional iwnfw \
- compile-with "${AWK} -f $S/tools/fw_stub.awk iwn.fw:iwnfw:44417 -lintel_iwn -miwn -c${.TARGET}" \
+iwn4965fw.c optional iwn4965fw | iwnfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn4965.fw:iwn4965fw -miwn4965fw -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwn4965fw.c"
+iwn4965fw.fwo optional iwn4965fw | iwnfw \
+ dependency "iwn4965.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn4965.fw" \
+ no-implicit-rule \
+ clean "iwn4965fw.fwo"
+iwn4965.fw optional iwn4965fw | iwnfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwn4965.fw"
+iwn5000fw.c optional iwn5000fw | iwnfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn5000.fw:iwn5000fw -miwn5000fw -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwn5000fw.c"
+iwn5000fw.fwo optional iwn5000fw | iwnfw \
+ dependency "iwn5000.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn5000.fw" \
+ no-implicit-rule \
+ clean "iwn5000fw.fwo"
+iwn5000.fw optional iwn5000fw | iwnfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwn5000.fw"
+iwn5150fw.c optional iwn5150fw | iwnfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn5150.fw:iwn5150fw -miwn5150fw -c${.TARGET}" \
no-implicit-rule before-depend local \
- clean "iwnfw.c"
-iwnfw.fwo optional iwnfw \
- dependency "iwn.fw" \
- compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn.fw" \
+ clean "iwn5150fw.c"
+iwn5150fw.fwo optional iwn5150fw | iwnfw \
+ dependency "iwn5150.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn5150.fw" \
no-implicit-rule \
- clean "iwnfw.fwo"
-iwn.fw optional iwnfw \
+ clean "iwn5150fw.fwo"
+iwn5150.fw optional iwn5150fw | iwnfw \
dependency ".PHONY" \
- compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu" \
no-obj no-implicit-rule \
- clean "iwn.fw"
+ clean "iwn5150.fw"
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#18 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.217 2009/09/04 09:33:50 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.218 2009/10/26 11:20:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -230,7 +230,7 @@
}
request->dev = dev;
request->flags = ATA_R_CONTROL;
- request->timeout = 5;
+ request->timeout = 10;
request->retries = 1;
request->callback = ad_power_callback;
request->u.ata.command = ATA_STANDBY_IMMEDIATE;
@@ -265,7 +265,7 @@
request->timeout = 31;
}
else {
- request->timeout = 5;
+ request->timeout = 10;
}
request->retries = 2;
request->data = bp->bio_data;
@@ -468,7 +468,7 @@
request->u.ata.count = 0;
request->u.ata.feature = 0;
request->flags = ATA_R_CONTROL | ATA_R_QUIET;
- request->timeout = 5;
+ request->timeout = 10;
request->retries = 0;
ata_queue_request(request);
if (request->status & ATA_S_ERROR)
@@ -487,7 +487,7 @@
request->u.ata.count = 1;
request->u.ata.feature = 0;
request->flags = ATA_R_CONTROL;
- request->timeout = 5;
+ request->timeout = 10;
request->retries = 0;
ata_queue_request(request);
if (request->status & ATA_S_ERROR)
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#19 (text+ko) ====
@@ -23,7 +23,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.109 2009/06/24 15:38:17 raj Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.110 2009/10/26 10:00:59 mav Exp $
*/
/* structure holding chipset config info */
@@ -415,6 +415,8 @@
#define ATA_VIA8237 0x32271106
#define ATA_VIA8237A 0x05911106
#define ATA_VIA8237S 0x53371106
+#define ATA_VIA8237_5372 0x53721106
+#define ATA_VIA8237_7372 0x73721106
#define ATA_VIA8251 0x33491106
#define ATA_VIA8361 0x31121106
#define ATA_VIA8363 0x03051106
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#22 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.86 2009/10/23 14:56:29 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.87 2009/10/26 11:20:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -143,7 +143,7 @@
atadev->spindown_state = 0;
request->timeout = 31;
} else {
- request->timeout = 5;
+ request->timeout = 10;
}
request->retries = 0;
ata_queue_request(request);
@@ -397,7 +397,7 @@
request->bytecount = sizeof(struct atapi_sense);
request->donecount = 0;
request->transfersize = sizeof(struct atapi_sense);
- request->timeout = 5;
+ request->timeout = 10;
request->flags &= (ATA_R_ATAPI | ATA_R_QUIET | ATA_R_DEBUG);
request->flags |= (ATA_R_READ | ATA_R_AT_HEAD | ATA_R_REQUEUE);
ATA_DEBUG_RQ(request, "autoissue request sense");
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#14 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.135 2009/09/08 13:19:05 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.136 2009/10/26 11:20:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -273,7 +273,7 @@
request->u.ata.lba = 0;
request->u.ata.count = 0;
request->u.ata.feature = 0;
- request->timeout = 1;
+ request->timeout = 10;
request->retries = 0;
request->flags |= ATA_R_ORDERED | ATA_R_DIRECT;
ata_queue_request(request);
@@ -4371,7 +4371,7 @@
return NULL;
}
request->dev = dev;
- request->timeout = 5;
+ request->timeout = 10;
request->retries = 2;
request->callback = ata_raid_done;
request->driver = rdp;
==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#19 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.63 2009/07/10 08:18:08 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.65 2009/10/26 11:26:49 mav Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -414,6 +414,12 @@
case ATA_UDMA6:
cpi->base_transfer_speed = 133000;
break;
+ case ATA_SA150:
+ cpi->base_transfer_speed = 150000;
+ break;
+ case ATA_SA300:
+ cpi->base_transfer_speed = 300000;
+ break;
default:
break;
}
@@ -629,7 +635,7 @@
request->data = buf;
request->bytecount = len;
request->transfersize = min(request->bytecount, 65534);
- request->timeout = ccb_h->timeout / 1000; /* XXX lost granularity */
+ request->timeout = (ccb_h->timeout + 999) / 1000;
request->callback = &atapi_cb;
request->flags = request_flags;
@@ -732,7 +738,7 @@
request->data = (caddr_t)&csio->sense_data;
request->bytecount = sizeof(struct atapi_sense);
request->transfersize = min(request->bytecount, 65534);
- request->timeout = csio->ccb_h.timeout / 1000;
+ request->timeout = (csio->ccb_h.timeout + 999) / 1000;
request->retries = 2;
request->flags = ATA_R_QUIET|ATA_R_ATAPI|ATA_R_IMMEDIATE;
hcb->flags |= AUTOSENSE;
==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#15 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.207 2009/10/23 14:56:29 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.208 2009/10/26 11:20:14 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -700,7 +700,7 @@
request->dev = dev;
bcopy(ccb, request->u.atapi.ccb, 16);
request->flags = ATA_R_ATAPI;
- request->timeout = 5;
+ request->timeout = 10;
ata_queue_request(request);
if (!request->error &&
(request->u.atapi.sense.key == 2 ||
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-nvidia.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-nvidia.c,v 1.9 2009/07/05 14:50:45 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-nvidia.c,v 1.10 2009/10/26 08:41:10 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -165,7 +165,8 @@
/* enable control access */
pci_write_config(dev, 0x50, pci_read_config(dev, 0x50, 1) | 0x04,1);
-
+ /* MCP55 seems to need some time to allow r_res2 read. */
+ DELAY(10);
if (ctlr->chip->cfg1 & NVQ) {
/* clear interrupt status */
ATA_OUTL(ctlr->r_res2, offset, 0x00ff00ff);
==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-via.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-via.c,v 1.6 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-via.c,v 1.8 2009/10/26 10:07:52 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -95,6 +95,8 @@
{ ATA_VIA8237, 0x00, VIA133, 0x00, ATA_UDMA6, "8237" },
{ ATA_VIA8237A, 0x00, VIA133, 0x00, ATA_UDMA6, "8237A" },
{ ATA_VIA8237S, 0x00, VIA133, 0x00, ATA_UDMA6, "8237S" },
+ { ATA_VIA8237_5372, 0x00, VIA133, 0x00, ATA_UDMA6, "8237" },
+ { ATA_VIA8237_7372, 0x00, VIA133, 0x00, ATA_UDMA6, "8237" },
{ ATA_VIA8251, 0x00, VIA133, 0x00, ATA_UDMA6, "8251" },
{ 0, 0, 0, 0, 0, 0 }};
static struct ata_chip_id new_ids[] =
@@ -103,6 +105,8 @@
{ ATA_VIA6421, 0x00, 6, VIABAR, ATA_SA150, "6421" },
{ ATA_VIA8237A, 0x00, 7, 0x00, ATA_SA150, "8237A" },
{ ATA_VIA8237S, 0x00, 7, 0x00, ATA_SA150, "8237S" },
+ { ATA_VIA8237_5372, 0x00, 7, 0x00, ATA_SA300, "8237" },
+ { ATA_VIA8237_7372, 0x00, 7, 0x00, ATA_SA300, "8237" },
{ ATA_VIA8251, 0x00, 0, VIAAHCI, ATA_SA300, "8251" },
{ 0, 0, 0, 0, 0, 0 }};
==== //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#7 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/iwn/if_iwn.c,v 1.19 2009/10/23 22:04:18 rpaulo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/iwn/if_iwn.c,v 1.20 2009/10/24 09:55:11 rpaulo Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -601,7 +601,7 @@
switch (sc->hw_type) {
case IWN_HW_REV_TYPE_4965:
sc->sc_hal = &iwn4965_hal;
- sc->fwname = "iwnfw-4965";
+ sc->fwname = "iwn4965fw";
sc->critical_temp = IWN_CTOK(110);
sc->txantmsk = IWN_ANT_A | IWN_ANT_B;
sc->rxantmsk = IWN_ANT_ABC;
@@ -610,7 +610,7 @@
break;
case IWN_HW_REV_TYPE_5100:
sc->sc_hal = &iwn5000_hal;
- sc->fwname = "iwnfw-5000";
+ sc->fwname = "iwn5000fw";
sc->critical_temp = 110;
sc->txantmsk = IWN_ANT_B;
sc->rxantmsk = IWN_ANT_A | IWN_ANT_B;
@@ -619,7 +619,7 @@
break;
case IWN_HW_REV_TYPE_5150:
sc->sc_hal = &iwn5000_hal;
- sc->fwname = "iwnfw-5150";
+ sc->fwname = "iwn5150fw";
/* NB: critical temperature will be read from EEPROM. */
sc->txantmsk = IWN_ANT_A;
sc->rxantmsk = IWN_ANT_A | IWN_ANT_B;
@@ -629,14 +629,14 @@
case IWN_HW_REV_TYPE_5300:
case IWN_HW_REV_TYPE_5350:
sc->sc_hal = &iwn5000_hal;
- sc->fwname = "iwnfw-5000";
+ sc->fwname = "iwn5000fw";
sc->critical_temp = 110;
sc->txantmsk = sc->rxantmsk = IWN_ANT_ABC;
sc->ntxchains = sc->nrxchains = 3;
break;
case IWN_HW_REV_TYPE_1000:
sc->sc_hal = &iwn5000_hal;
- sc->fwname = "iwnfw-1000";
+ sc->fwname = "iwn1000fw";
sc->critical_temp = 110;
sc->txantmsk = IWN_ANT_A;
sc->rxantmsk = IWN_ANT_A | IWN_ANT_B;
@@ -645,7 +645,7 @@
break;
case IWN_HW_REV_TYPE_6000:
sc->sc_hal = &iwn5000_hal;
- sc->fwname = "iwnfw-6000";
+ sc->fwname = "iwn6000fw";
sc->critical_temp = 110;
sc->txantmsk = IWN_ANT_ABC;
sc->rxantmsk = IWN_ANT_ABC;
@@ -654,7 +654,7 @@
break;
case IWN_HW_REV_TYPE_6050:
sc->sc_hal = &iwn5000_hal;
- sc->fwname = "iwnfw-6050";
+ sc->fwname = "iwn6050fw";
sc->critical_temp = 110;
sc->txantmsk = IWN_ANT_ABC;
sc->rxantmsk = IWN_ANT_ABC;
@@ -1150,7 +1150,6 @@
*/
for (i = 0; i < IWN_RX_RING_COUNT; i++) {
struct iwn_rx_data *data = &ring->data[i];
- struct mbuf *m;
bus_addr_t paddr;
error = bus_dmamap_create(ring->desc_dma.tag, 0, &data->map);
@@ -1161,8 +1160,8 @@
goto fail;
}
- m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
- if (m == NULL) {
+ data->m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
+ if (data->m == NULL) {
device_printf(sc->sc_dev,
"%s: could not allocate rx mbuf\n", __func__);
error = ENOMEM;
@@ -1171,21 +1170,17 @@
/* Map page. */
error = bus_dmamap_load(ring->desc_dma.tag, data->map,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list