svn commit: r202705 - stable/8/share/man/man4
Konstantin Belousov
kib at FreeBSD.org
Wed Jan 20 15:24:25 UTC 2010
Author: kib
Date: Wed Jan 20 15:24:24 2010
New Revision: 202705
URL: http://svn.freebsd.org/changeset/base/202705
Log:
MFC r198470, r198521:
Syncronize iwn(4) manpages with HEAD.
Modified:
stable/8/share/man/man4/iwn.4
stable/8/share/man/man4/iwnfw.4
Directory Properties:
stable/8/share/man/man4/ (props changed)
stable/8/share/man/man4/de.4 (props changed)
Modified: stable/8/share/man/man4/iwn.4
==============================================================================
--- stable/8/share/man/man4/iwn.4 Wed Jan 20 15:22:34 2010 (r202704)
+++ stable/8/share/man/man4/iwn.4 Wed Jan 20 15:24:24 2010 (r202705)
@@ -25,36 +25,53 @@
.\"
.\" $FreeBSD$
.\"
-.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.
+Choose 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
+module at boot time, place the following lines 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 ,
Modified: stable/8/share/man/man4/iwnfw.4
==============================================================================
--- stable/8/share/man/man4/iwnfw.4 Wed Jan 20 15:22:34 2010 (r202704)
+++ stable/8/share/man/man4/iwnfw.4 Wed Jan 20 15:24:24 2010 (r202705)
@@ -22,7 +22,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 9, 2009
+.Dd October 25, 2009
.Dt IWNFW 4
.Os
.Sh NAME
@@ -36,15 +36,26 @@ kernel configuration file:
.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
More information about the svn-src-stable-8
mailing list