Multi-bss (aka vap) support for 802.11 devices.

Note this includes changes to all drivers and moves some device firmware
loading to use firmware(9) and a separate module (e.g. ral).  Also there
no longer are separate wlan_scan* modules; this functionality is now
bundled into the wlan module.

Supported by:	Hobnob and Marvell
Reviewed by:	many
Obtained from:	Atheros (some bits)

1 files changed, 50 insertions, 41 deletions

diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4
index bc6e7964942e..c57385640f9a 100644
--- a/share/man/man4/wpi.4
+++ b/share/man/man4/wpi.4
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 6, 2007
+.Dd Apri 13, 2008
 .Os
 .Dt WPI 4
 .Sh NAME
@@ -38,6 +38,7 @@ place the following lines in your
 kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "device wpi"
+.Cd "device wpifw"
 .Cd "device pci"
 .Cd "device wlan"
 .Cd "device wlan_amrr"
@@ -45,40 +46,41 @@ kernel configuration file:
 .Ed
 .Pp
 Alternatively, to load the driver as a
-module at boot time, place the following lines in
+module at boot time, place the following line in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
 if_wpi_load="YES"
-wlan_load="YES"
-wlan_amrr_load="YES"
-firmware_load="YES"
 .Ed
 .Pp
 In both cases, place the following line in
 .Xr loader.conf 5
-to load the firmware modules:
+to acknowledge the firmware license (see below):
 .Bd -literal -offset indent
-wpifw_load="YES"
+legal.intel_wpi.license_ack=1
 .Ed
 .Sh DESCRIPTION
 The
 .Nm
-driver is an experimental driver providing support for the
+driver provides support for the
 .Tn Intel
 3945ABG Wireless network adapter
-.Pp
-By default, the
 .Nm
-driver configures the adapter for BSS operation (aka infrastructure mode).
-This mode requires the use of an access point.
-.Pp
+supports
+.Cm station ,
+.Cm adhoc ,
+and
+.Cm monitor
+mode operation.
+Only one virtual interface may be configured at any time.
 For more information on configuring this device, see
 .Xr ifconfig 8 .
 .Pp
-This driver requires firmware to be loaded before it will work.
-For the loaded firmware to work the license at
-.Pa /usr/share/doc/legal/intel_wpi/LICENSE
-must be agreed to and the following line be added to
+This driver requires the firmware built with the
+.Nm wpifw
+module to work.
+For the loaded firmware to be enabled for use the license at
+.Pa /usr/share/doc/legal/intel_iwi/LICENSE
+must be agreed by adding the following line to
 .Xr loader.conf 5 :
 .Pp
 .Dl "legal.intel_wpi.license_ack=1"
@@ -91,35 +93,38 @@ firmware license
 .Sh EXAMPLES
 Join an existing BSS network (i.e., connect to an access point):
 .Pp
-.Dl "ifconfig wpi0 inet 192.168.0.20 netmask 0xffffff00"
+.Bd -literal -offset indent
+ifconfig wlan create wlandev wpi0 inet 192.168.0.20 \e
+    netmask 0xffffff00
+.Ed
 .Pp
 Join a specific BSS network with network name
 .Dq Li my_net :
 .Pp
-.Dl "ifconfig wpi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net"
+.Dl "ifconfig wlan create wlandev wpi0 ssid my_net up"
 .Pp
-Join a specific BSS network with 40-bit WEP encryption:
+Join a specific BSS network with 64-bit WEP encryption:
 .Bd -literal -offset indent
-ifconfig wpi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
-    wepmode on wepkey 0x1234567890 weptxkey 1
+ifconfig wlan create wlandev wpi0 ssid my_net \e
+	wepmode on wepkey 0x1234567890 weptxkey 1 up
 .Ed
 .Pp
-Join a specific BSS network with 104-bit WEP encryption:
+Join a specific BSS network with 128-bit WEP encryption:
 .Bd -literal -offset indent
-ifconfig wpi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
+ifconfig wlan create wlandev wpi0 wlanmode adhoc ssid my_net \e
     wepmode on wepkey 0x01020304050607080910111213 weptxkey 1
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
+.It "wpi%d: could not load firmware image '%s'"
+The driver failed to load the firmware image using the
 .Xr firmware 9
 subsystem.
-Verify that the necessary firmware modules are loaded and the
-license agreement
+Verify the 
+.Xr wpifw
+firmware module is installed and the license agreement
 .Xr loader 8
 tunable has been set.
-.It "wpi%d: could not load firmware"
-An attempt to upload the firmware image to the onboard microcontroller failed.
-This should not happen.
 .It "wpi%d: fatal firmware error"
 An unknown error has occurred in the uploaded firmware, you may have to
 unload/reload the driver to continue.
@@ -129,23 +134,27 @@ Data transmission is not possible in this state.
 .Sh BUGS
 Not all the error messages are documented here.
 .Pp
-Automatic recovery of firmware failures is not currently supported, nor is 
-detection of toggling the radio switch on.
-.Pp
 Background scanning is not currently supported.
 .El
 .Sh SEE ALSO
-.Xr altq 4 ,
-.Xr ipw 4 ,
-.Xr iwi 4 ,
+.Xr wpifw 4 ,
 .Xr pci 4 ,
 .Xr wlan 4 ,
-.Xr ifconfig 8
+.Xr wlan_ccmp 4 ,
+.Xr wlan_tkip 4 ,
+.Xr wlan_wep 4 ,
+.Xr ifconfig 8 ,
+.Xr wpa_supplicant 8 .
 .Sh AUTHORS
 .An -nosplit
-The
+The original
 .Nm
-driver was written by
-.An Damien Bergamini Aq damien.bergamini@free.fr
-and
-.An Benjamin Close Aq benjsc@FreeBSD.org .
+driver was written for
+.Ox
+by
+.An Damien Bergamini Aq damien.bergamini@free.fr .
+.An Benjamin Close Aq benjsc@FreeBSD.org 
+ported 
+.Nm
+to
+.Fx .