Author: bschmidt
Date: Tue Jul 20 11:08:56 2010
New Revision: 210291
URL: http://svn.freebsd.org/changeset/base/210291
Log:
MFC r203691:
- Update documentation for the iwn and iwnfw drivers: they support the
1000, 5150, 6000 and 6050 devices too, with firmware modules for the
- 4965, 1000, 5000, 5150 and 6000.
- Add documentation for mwl and all the wireless firmware drivers.
Modified:
stable/8/share/man/man4/iwn.4
stable/8/share/man/man4/iwnfw.4
stable/8/sys/amd64/conf/NOTES
stable/8/sys/i386/conf/NOTES
Directory Properties:
stable/8/share/man/man4/ (props changed)
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/share/man/man4/iwn.4
==============================================================================
--- stable/8/share/man/man4/iwn.4 Tue Jul 20 10:58:56 2010
(r210290)
+++ stable/8/share/man/man4/iwn.4 Tue Jul 20 11:08:56 2010
(r210291)
@@ -25,12 +25,13 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 25, 2009
+.Dd February 8, 2010
.Os
.Dt IWN 4
.Sh NAME
.Nm iwn
-.Nd "Intel Wireless WiFi Link 4965/5000 IEEE 802.11n driver"
+.Nd Intel Wireless WiFi Link 4965/1000/5000/5150/5300/6000/6050
+IEEE 802.11n driver
.Sh SYNOPSIS
To compile this driver into the kernel,
include the following lines in your
@@ -46,8 +47,10 @@ You also need to select a firmware for y
Choose one from:
.Bd -ragged -offset indent
.Cd "device iwn4965fw"
+.Cd "device iwn1000fw"
.Cd "device iwn5000fw"
-.Cd "device iwn5100fw"
+.Cd "device iwn5150fw"
+.Cd "device iwn6000fw"
.Ed
.Pp
Or you can use
@@ -63,15 +66,18 @@ module at boot time, place the following
.Bd -literal -offset indent
if_iwn_load="YES"
iwn4965fw_load="YES"
+iwn1000fw_load="YES"
iwn5000fw_load="YES"
-iwn5100fw_load="YES"
+iwn5150fw_load="YES"
+iwn6000fw_load="YES"
.Ed
.Sh DESCRIPTION
The
.Nm
driver provides support for
.Tn Intel
-Wireless WiFi Link 4965 and 5000 series of PCI-Express network adapters.
+Wireless WiFi Link 4965, 1000, 5000 and 6000 series of
+PCI-Express network adapters.
.Nm
supports
.Cm station ,
Modified: stable/8/share/man/man4/iwnfw.4
==============================================================================
--- stable/8/share/man/man4/iwnfw.4 Tue Jul 20 10:58:56 2010
(r210290)
+++ stable/8/share/man/man4/iwnfw.4 Tue Jul 20 11:08:56 2010
(r210291)
@@ -22,7 +22,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 25, 2009
+.Dd February 7, 2010
.Dt IWNFW 4
.Os
.Sh NAME
@@ -41,8 +41,10 @@ If you want to pick only the firmware im
of the following:
.Bd -ragged -offset indent
.Cd "device iwn4965fw"
+.Cd "device iwn1000fw"
.Cd "device iwn5000fw"
-.Cd "device iwn5100fw"
+.Cd "device iwn5150fw"
+.Cd "device iwn6000fw"
.Ed
.Pp
Alternatively, to load the driver as a
@@ -50,12 +52,15 @@ module at boot time, place the following
.Xr loader.conf 5 :
.Bd -literal -offset indent
iwn4965fw_load="YES"
+iwn1000fw_load="YES"
iwn5000fw_load="YES"
-iwn5100fw_load="YES"
+iwn5150fw_load="YES"
+iwn6000fw_load="YES"
.Ed
.Sh DESCRIPTION
This module provides access to firmware sets for the
-Intel Wireless WiFi Link 4965 and 5000 series of IEEE 802.11n adapters.
+Intel Wireless WiFi Link 4965, 1000, 5000 and 6000 series of
+IEEE 802.11n adapters.
It may be
statically linked into the kernel, or loaded as a module.
.Sh SEE ALSO
Modified: stable/8/sys/amd64/conf/NOTES
==============================================================================
--- stable/8/sys/amd64/conf/NOTES Tue Jul 20 10:58:56 2010
(r210290)
+++ stable/8/sys/amd64/conf/NOTES Tue Jul 20 11:08:56 2010
(r210291)
@@ -273,20 +273,27 @@ options DRM_DEBUG # Include debug print
# HP PC Lan+, various PC Card devices
# (requires miibus)
# ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter
+# Requires the ipw firmware module
# iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters
-# iwn: Intel Wireless WiFi Link 4965AGN 802.11 network adapters
+# Requires the iwi firmware module
+# iwn: Intel Wireless WiFi Link 4965/1000/5000/6000 802.11 network adapters
+# Requires the iwn firmware module
+# mwl: Marvell 88W8363 IEEE 802.11 adapter
+# Requires the mwl firmware module
# nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source)
# nve: nVidia nForce MCP on-board Ethernet Networking
# ral: Ralink Technology IEEE 802.11 wireless adapter
# wpi: Intel 3945ABG Wireless LAN controller
+# Requires the wpi firmware module
device ed
options ED_3C503
options ED_HPP
options ED_SIC
+device ipw
device iwi
device iwn
-device ipw
+device mwl
device nfe
device nve
device ral
@@ -299,6 +306,45 @@ device ath_rate_sample # SampleRate tx
#device ath_rate_amrr # AMRR rate control for ath
driver
#device ath_rate_onoe # Onoe rate control for ath
driver
+# IEEE 802.11 adapter firmware modules
+
+# Intel PRO/Wireless 2100 firmware:
+# ipwfw: BSS/IBSS/monitor mode firmware
+# ipwbssfw: BSS mode firmware
+# ipwibssfw: IBSS mode firmware
+# ipwmonitorfw: Monitor mode firmware
+# Intel PRO/Wireless 2200BG/2225BG/2915ABG firmware:
+# iwifw: BSS/IBSS/monitor mode firmware
+# iwibssfw: BSS mode firmware
+# iwiibssfw: IBSS mode firmware
+# iwimonitorfw: Monitor mode firmware
+# Intel Wireless WiFi Link 4965/1000/5000/6000 series firmware:
+# iwnfw: Single module to support the 4965/1000/5000/5150/6000
+# iwn4965fw: Specific module for the 4965 only
+# iwn1000fw: Specific module for the 1000 only
+# iwn5000fw: Specific module for the 5000 only
+# iwn5150fw: Specific module for the 5150 only
+# iwn6000fw: Specific module for the 6000 only
+# mwlfw: Marvell 88W8363 firmware
+# wpifw: Intel 3945ABG Wireless LAN Controller firmware
+
+device iwifw
+device iwibssfw
+device iwiibssfw
+device iwimonitorfw
+device ipwfw
+device ipwbssfw
+device ipwibssfw
+device ipwmonitorfw
+device iwnfw
+device iwn4965fw
+device iwn1000fw
+device iwn5000fw
+device iwn5150fw
+device iwn6000fw
+device mwlfw
+device wpifw
+
#
#XXX this stores pointers in a 32bit field that is defined by the hardware
#device pst
Modified: stable/8/sys/i386/conf/NOTES
==============================================================================
--- stable/8/sys/i386/conf/NOTES Tue Jul 20 10:58:56 2010
(r210290)
+++ stable/8/sys/i386/conf/NOTES Tue Jul 20 11:08:56 2010
(r210291)
@@ -552,13 +552,18 @@ hint.mse.0.irq="5"
# Intel EtherExpress
# ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter
# iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters
+# Requires the iwi firmware module
# iwn: Intel Wireless WiFi Link 4965AGN 802.11 network adapters
+# Requires the iwn firmware module
+# mwl: Marvell 88W8363 IEEE 802.11 adapter
+# Requires the mwl firmware module
# nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source)
# nve: nVidia nForce MCP on-board Ethernet Networking
# ral: Ralink Technology IEEE 802.11 wireless adapter
# sbni: Granch SBNI12-xx ISA and PCI adapters
# wl: Lucent Wavelan (ISA card only).
# wpi: Intel 3945ABG Wireless LAN controller
+# Requires the wpi firmware module
# Order for ISA/EISA devices is important here
@@ -600,14 +605,15 @@ hint.ie.2.at="isa"
hint.ie.2.port="0x300"
hint.ie.2.irq="5"
hint.ie.2.maddr="0xd0000"
+device ipw
device iwi
device iwn
-device ipw
# Hint for the i386-only ISA front-end of le(4).
hint.le.0.at="isa"
hint.le.0.port="0x280"
hint.le.0.irq="10"
hint.le.0.drq="0"
+device mwl
device nfe # nVidia nForce MCP on-board Ethernet Networking
device nve # nVidia nForce MCP on-board Ethernet Networking
device ral
@@ -623,6 +629,45 @@ options WLCACHE # enables the signal-s
options WLDEBUG # enables verbose debugging output
device wpi
+# IEEE 802.11 adapter firmware modules
+
+# Intel PRO/Wireless 2100 firmware:
+# ipwfw: BSS/IBSS/monitor mode firmware
+# ipwbssfw: BSS mode firmware
+# ipwibssfw: IBSS mode firmware
+# ipwmonitorfw: Monitor mode firmware
+# Intel PRO/Wireless 2200BG/2225BG/2915ABG firmware:
+# iwifw: BSS/IBSS/monitor mode firmware
+# iwibssfw: BSS mode firmware
+# iwiibssfw: IBSS mode firmware
+# iwimonitorfw: Monitor mode firmware
+# Intel Wireless WiFi Link 4965/1000/5000/6000 series firmware:
+# iwnfw: Single module to support the 4965/1000/5000/5150/6000
+# iwn4965fw: Specific module for the 4965 only
+# iwn1000fw: Specific module for the 1000 only
+# iwn5000fw: Specific module for the 5000 only
+# iwn5150fw: Specific module for the 5150 only
+# iwn6000fw: Specific module for the 6000 only
+# mwlfw: Marvell 88W8363 firmware
+# wpifw: Intel 3945ABG Wireless LAN Controller firmware
+
+device iwifw
+device iwibssfw
+device iwiibssfw
+device iwimonitorfw
+device ipwfw
+device ipwbssfw
+device ipwibssfw
+device ipwmonitorfw
+device iwnfw
+device iwn4965fw
+device iwn1000fw
+device iwn5000fw
+device iwn5150fw
+device iwn6000fw
+device mwlfw
+device wpifw
+
#
# ATA raid adapters
#
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
