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)

16 files changed, 586 insertions, 491 deletions

diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4
index 44705f1..80d094a 100644
--- a/share/man/man4/ath.4
+++ b/share/man/man4/ath.4
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
+.\" Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
 .\" All rights reserved.
 .\""
 .\" Redistribution and use in source and binary forms, with or without
@@ -12,9 +12,6 @@
 .\"    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.
 .\"
 .\" NO WARRANTY
 .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -31,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"/
-.Dd December 7, 2006
+.Dd April 13, 2008
 .Dt ATH 4
 .Os
 .Sh NAME
@@ -59,7 +56,7 @@ The
 .Nm
 driver provides support for wireless network adapters based on
 the Atheros AR5210, AR5211, and AR5212 programming APIs.
-These APIs are used by a wide variety of chips; all chips with
+These APIs are used by a wide variety of chips; most all chips with
 a PCI and/or CardBus interface are supported.
 Chip-specific support is provided by the Atheros Hardware Access Layer
 (HAL), that is packaged separately.
@@ -97,26 +94,32 @@ To enable encryption, use
 .Xr ifconfig 8
 as shown below.
 .Pp
-By default, the
-.Nm
-driver configures the card for BSS operation (aka infrastructure
-mode).
-This mode requires the use of an access point (base station).
-.Pp
-The
-.Nm
-driver also supports the standard IBSS point-to-point mode
-where stations can communicate amongst themselves without the
-aid of an access point.
-.Pp
-The driver may also be configured to operate in hostap mode.
-In this mode a host may function as an access point (base station).
-Access points are different than operating in IBSS mode.
-They operate in BSS mode.
-They allow for easier roaming and bridge all Ethernet traffic such
-that machines connected via an access point appear to be on the local
-Ethernet segment.
-.Pp
+The driver supports
+.Cm station ,
+.Cm adhoc ,
+.Cm adhoc-demo ,
+.Cm hostap ,
+.Cm wds ,
+and
+.Cm monitor
+mode operation.
+Multiple
+.Cm hostap
+virtual interfaces may be configured for simultaneous
+use on cards that use a 5212 part.
+When multiple interfaces are configured each may have a separate
+mac address that is formed by setting the U/L bits in the mac
+address assigned to the underlying device.
+Any number of 
+.Cm wds
+virtual interfaces may be configured together with
+.Cm hostap
+interfaces.
+Multiple
+.Cm station
+interfaces may be operated together with 
+.Cm hostap
+interfaces to construct a wireless repeater device.
 For more information on configuring this device, see
 .Xr ifconfig 8 .
 .Pp
@@ -127,8 +130,10 @@ Wireless cards in Cardbus slots may be inserted and ejected on the fly.
 .Sh HARDWARE
 The
 .Nm
-driver supports all Atheros Cardbus or PCI cards,
+driver supports most Atheros Cardbus or PCI cards,
 except those that are based on the AR5005VL chipset.
+More recent parts may require a hal that is not part of
+.Fb .
 .Pp
 A list of cards that are supported can be found at
 .Pa http://customerproducts.atheros.com/customerproducts/default.asp .
@@ -144,38 +149,37 @@ Join a specific BSS network with network name
 .Pp
 Join a specific BSS network with WEP encryption:
 .Bd -literal -offset indent
-ifconfig ath0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
+ifconfig wlan0 create wlandev ath0
+ifconfig wlan0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
 	wepmode on wepkey 0x8736639624
 .Ed
 .Pp
 Join/create an 802.11b IBSS network with network name
 .Dq Li my_net :
 .Bd -literal -offset indent
-ifconfig ath0 inet 192.168.0.22 netmask 0xffffff00 ssid my_net \e
-	mode 11b mediaopt adhoc
+ifconfig wlan0 create wlandev ath0 wlanmode adhoc
+ifconfig wlan0 inet 192.168.0.22 netmask 0xffffff00 ssid my_net \e
+	mode 11b
 .Ed
 .Pp
 Create an 802.11g host-based access point:
 .Bd -literal -offset indent
-ifconfig ath0 inet 192.168.0.10 netmask 0xffffff00 ssid my_ap \e
-	mode 11g mediaopt hostap
+ifconfig wlan0 create wlandev ath0 wlanmode hostap
+ifconfig wlan0 inet 192.168.0.10 netmask 0xffffff00 ssid my_ap \e
+	mode 11g
 .Ed
 .Pp
-Create an 802.11a host-based access point with WEP enabled:
+Create two virtual 802.11a host-based access points, one with
+with WEP enabled and one with no security, and bridge them to
+the fxp0 (wired) device:
 .Bd -literal -offset indent
-ifconfig ath0 inet 192.168.0.10 netmask 0xffffff00 ssid my_ap \e
-	wepmode on wepkey 0x1234567890 mode 11a mediaopt hostap
+ifconfig wlan0 create wlandev ath0 wlanmode hostap \e
+	ssid paying-customers wepmode on wepkey 0x1234567890 \e
+	mode 11a up 
+ifconfig wlan1 create wlandev ath0 wlanmode hostap bssid \e
+	ssid freeloaders up
+ifconfig bridge0 create addm wlan0 addm wlan1 addm fxp0 up
 .Ed
-.Pp
-Create a host-based wireless bridge to fxp0:
-.Bd -literal -offset indent
-ifconfig ath0 inet up ssid my_ap media DS/11Mbps mediaopt hostap
-sysctl net.inet.ip.check_interface=0
-ifconfig bridge0 create
-ifconfig bridge0 addm ath0 addm fxp0 up
-.Ed
-.Pp
-This will give you the same functionality as an access point.
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "ath%d: unable to attach hardware; HAL status %u"
@@ -252,15 +256,18 @@ The driver was unable to install the device interrupt handler.
 This should not happen.
 .El
 .Sh SEE ALSO
-.Xr altq 4 ,
-.Xr an 4 ,
-.Xr arp 4 ,
 .Xr ath_hal 4 ,
-.Xr netintro 4 ,
+.Xr intro 4 ,
+.Xr cardbus 4 ,
 .Xr pcic 4 ,
-.Xr wi 4 ,
 .Xr wlan 4 ,
+.Xr wlan_ccmp 4 ,
+.Xr wlan_tkip 4 ,
+.Xr wlan_wep 4 ,
+.Xr wlan_xauth 4 ,
+.Xr hostapd 8 ,
 .Xr ifconfig 8 ,
+.Xr wpa_supplicant 8 .
 .Sh HISTORY
 The
 .Nm
@@ -281,17 +288,7 @@ Intersil PrismGT chip and are not supported by this driver.
 .Sh BUGS
 There is no software retransmit; only hardware retransmit is used.
 .Pp
-The driver does not fully enable power-save operation of the chip;
-consequently power use is suboptimal.
-.Pp
-The driver honors the regulatory domain programmed into the EEPROM of a
-device and does not support overriding this setting.
-This is done to insure compliance with local regulatory agencies when
-operating as an access point.
-Unfortunately this also means that devices purchased for use in one locale
-may not be usable in another.
-Changes are planned to remove this restriction when operating in station mode.
+The driver does not fully enable power-save operation of the chip
+in station mode; consequently power use is suboptimal (e.g. on a laptop).
 .Pp
 WPA is not supported for 5210 parts.
-.Pp
-Atheros' SuperG functionality is not supported.
diff --git a/share/man/man4/ipw.4 b/share/man/man4/ipw.4
index 02c1f6a..30293f0 100644
--- a/share/man/man4/ipw.4
+++ b/share/man/man4/ipw.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 6, 2007
+.Dd April 13, 2008
 .Os
 .Dt IPW 4
 .Sh NAME
@@ -37,27 +37,24 @@ place the following lines in your
 kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "device ipw"
+.Cd "device ipwfw"
 .Cd "device pci"
 .Cd "device wlan"
 .Cd "device firmware"
 .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_ipw_load="YES"
-wlan_load="YES"
-firmware_load="YES"
 .Ed
 .Pp
-In both cases, place the following lines in
+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
-ipw_bss_load="YES"
-ipw_ibss_load="YES"
-ipw_monitor_load="YES"
+legal.intel_ipw.license_ack=1
 .Ed
 .Sh DESCRIPTION
 The
@@ -65,19 +62,23 @@ The
 driver provides support for the
 .Tn Intel
 PRO/Wireless 2100 MiniPCI 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
+This driver requires the firmware built with the
+.Nm ipwfw
+module to work.
+For the loaded firmware to be enabled for use the license at
 .Pa /usr/share/doc/legal/intel_ipw/LICENSE
-must be agreed to and the following line be added to
+must be agreed by adding the following line to
 .Xr loader.conf 5 :
 .Pp
 .Dl "legal.intel_ipw.license_ack=1"
@@ -90,22 +91,25 @@ firmware license
 .Sh EXAMPLES
 Join an existing BSS network (i.e., connect to an access point):
 .Pp
-.Dl "ifconfig ipw0 inet 192.168.0.20 netmask 0xffffff00"
+.Bd -literal -offset indent
+ifconfig wlan create wlandev ipw0 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 ipw0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net"
+.Dl "ifconfig wlan create wlandev ipw0 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 ipw0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
-    wepmode on wepkey 0x1234567890 weptxkey 1
+ifconfig wlan create wlandev ipw0 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 ipw0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
+ifconfig wlan create wlandev ipw0 wlanmode adhoc ssid my_net \e
     wepmode on wepkey 0x01020304050607080910111213 weptxkey 1
 .Ed
 .Sh DIAGNOSTICS
@@ -124,8 +128,9 @@ This should not happen.
 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 ipwfw 4
+firmware module is installed and the license agreement
 .Xr loader 8
 tunable has been set.
 .It "ipw%d: could not load microcode"
@@ -136,14 +141,16 @@ An attempt to upload the firmware image to the onboard microcontroller failed.
 This should not happen.
 .El
 .Sh SEE ALSO
-.Xr altq 4 ,
-.Xr iwi 4 ,
+.Xr ipwfw 4 ,
 .Xr pci 4 ,
 .Xr wlan 4 ,
-.Xr wpi 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
-The
+The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien@FreeBSD.org .
+.An Damien Bergamini Aq damien.bergamini@free.fr
diff --git a/share/man/man4/iwi.4 b/share/man/man4/iwi.4
index 8a6e9bc..8f82df2 100644
--- a/share/man/man4/iwi.4
+++ b/share/man/man4/iwi.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 6, 2007
+.Dd Apri 13, 2008
 .Os
 .Dt IWI 4
 .Sh NAME
@@ -33,31 +33,28 @@
 .Nd "Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 driver"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
-place the following lines in your
+include the following lines in your
 kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "device iwi"
+.Cd "device iwifw"
 .Cd "device pci"
 .Cd "device wlan"
 .Cd "device firmware"
 .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_iwi_load="YES"
-wlan_load="YES"
-firmware_load="YES"
 .Ed
 .Pp
-In both cases, place the following lines in
+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
-iwi_bss_load="YES"
-iwi_ibss_load="YES"
-iwi_monitor_load="YES"
+legal.intel_iwi.license_ack=1
 .Ed
 .Sh DESCRIPTION
 The
@@ -65,19 +62,23 @@ The
 driver provides support for
 .Tn Intel
 PRO/Wireless 2200BG/2915ABG MiniPCI and 2225BG PCI network adapters.
-.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
+This driver requires the firmware built with the
+.Nm iwifw
+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 to and the following line be added to
+must be agreed by adding the following line to
 .Xr loader.conf 5 :
 .Pp
 .Dl "legal.intel_iwi.license_ack=1"
@@ -90,22 +91,25 @@ firmware license
 .Sh EXAMPLES
 Join an existing BSS network (i.e., connect to an access point):
 .Pp
-.Dl "ifconfig iwi0 inet 192.168.0.20 netmask 0xffffff00"
+.Bd -literal -offset indent
+ifconfig wlan create wlandev iwi0 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 iwi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net"
+.Dl "ifconfig wlan create wlandev iwi0 ssid my_net up"
 .Pp
 Join a specific BSS network with 64-bit WEP encryption:
 .Bd -literal -offset indent
-ifconfig iwi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
-    wepmode on wepkey 0x1234567890 weptxkey 1
+ifconfig wlan create wlandev iwi0 ssid my_net \e
+	wepmode on wepkey 0x1234567890 weptxkey 1 up
 .Ed
 .Pp
 Join a specific BSS network with 128-bit WEP encryption:
 .Bd -literal -offset indent
-ifconfig iwi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
+ifconfig wlan create wlandev iwi0 wlanmode adhoc ssid my_net \e
     wepmode on wepkey 0x01020304050607080910111213 weptxkey 1
 .Ed
 .Sh DIAGNOSTICS
@@ -114,7 +118,7 @@ ifconfig iwi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
 The driver will reset the hardware.
 This should not happen.
 .It "iwi%d: firmware error"
-The onboard microcontroller crashes for some reason.
+The onboard microcontroller crashed for some reason.
 The driver will reset the hardware.
 This should not happen.
 .It "iwi%d: timeout waiting for firmware initialization to complete"
@@ -124,8 +128,9 @@ This should not happen.
 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 iwifw 4
+firmware module is installed and the license agreement
 .Xr loader 8
 tunable has been set.
 .It "iwi%d: could not load boot firmware"
@@ -141,14 +146,16 @@ failed.
 This should not happen.
 .El
 .Sh SEE ALSO
-.Xr altq 4 ,
-.Xr ipw 4 ,
+.Xr iwifw 4 ,
 .Xr pci 4 ,
 .Xr wlan 4 ,
-.Xr wpi 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
-The
+The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien@FreeBSD.org .
+.An Damien Bergamini Aq damien.bergamini@free.fr
diff --git a/share/man/man4/malo.4 b/share/man/man4/malo.4
index 98f702a..e3a5c6b 100644
--- a/share/man/man4/malo.4
+++ b/share/man/man4/malo.4
@@ -31,7 +31,7 @@
 .\"
 .\" $FreeBSD$
 .\"/
-.Dd March 25, 2008
+.Dd April 13, 2008
 .Dt MALO 4
 .Os
 .Sh NAME
@@ -53,41 +53,33 @@ module at boot time, place the following lines in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
 if_malo_load="YES"
-wlan_load="YES"
-firmware_load="YES"
-.Ed
-.Pp
-In both cases, place the following line in
-.Xr loader.conf 5
-to load the firmware module:
-.Bd -literal -offset indent
-malofw_load="YES"
 .Ed
 .Sh DESCRIPTION
 The
 .Nm
 driver provides support for Marvell Libertas 88W8335 based PCI
-network adapters.
-.Pp
-This driver requires firmware to be loaded before it will work.
-These firmware files are from the
-.Ox
+and Cardbus network adapters.
 .Nm
-driver.
+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
-A package for the firmware which can be installed via
+This driver requires the
+.Nm malofw
+be installed before it will work.
+The firmware files are not publicly available.
+A package of the firmware which can be installed via
 .Xr pkg_add 1
-can be found at:
+with:
 .Bd -literal -offset indent
 http://weongyo.org/project/malo/malo-firmware-1.4.tar.gz
 .Ed
-.Pp
-This package must be installed before
-.Xr ifconfig 8
-will work.
-.Pp 
-For more information on configuring this device, see
-.Xr ifconfig 8 .
 .Sh HARDWARE
 The following cards are among those supported by the
 .Nm
@@ -102,26 +94,38 @@ U-Khan UW-2054i	88W8335	PCI	b/g
 .Sh EXAMPLES
 Join an existing BSS network (i.e., connect to an access point):
 .Pp
-.Dl "ifconfig malo0 inet 192.168.0.20 netmask 0xffffff00"
+.Bd -literal -offset indent
+ifconfig wlan create wlandev iwn0 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 malo0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net"
+.Dl "ifconfig wlan create wlandev iwn0 ssid my_net up"
+.Pp
+Join a specific BSS network with 64-bit WEP encryption:
+.Bd -literal -offset indent
+ifconfig wlan create wlandev iwn0 ssid my_net \e
+	wepmode on wepkey 0x1234567890 weptxkey 1 up
+.Ed
 .Pp
-Join a specific BSS network with WEP encryption:
+Join a specific BSS network with 128-bit WEP encryption:
 .Bd -literal -offset indent
-ifconfig malo0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
-        wepmode on wepkey 0x8736639624
+ifconfig wlan create wlandev iwn0 wlanmode adhoc ssid my_net \e
+    wepmode on wepkey 0x01020304050607080910111213 weptxkey 1
+.Ed
 .Ed
 .Sh SEE ALSO
-.Xr altq 4 ,
-.Xr arp 4 ,
-.Xr cardbus 4 ,
-.Xr netintro 4 ,
+.Xr malofw 4 ,
 .Xr pci 4 ,
+.Xr cardbus 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 HISTORY
 The
 .Nm
diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4
index 65ee974..be64123 100644
--- a/share/man/man4/ral.4
+++ b/share/man/man4/ral.4
@@ -15,7 +15,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 10, 2007
+.Dd April 13, 2008
 .Os
 .Dt RAL 4
 .Sh NAME
@@ -27,7 +27,10 @@ place the following lines in your
 kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "device ral"
+.Cd "device ralfw"
 .Cd "device wlan"
+.Cd "device wlan_amrr"
+.Cd "device firmware"
 .Ed
 .Pp
 Alternatively, to load the driver as a
@@ -63,6 +66,31 @@ MIMO is the basis of the forthcoming IEEE 802.11n standard.
 The transmit speed is user-selectable or can be adapted automatically by the
 driver depending on the received signal strength and on the number of hardware
 transmission retries.
+.Pp
+.Nm
+supports
+.Cm station ,
+.Cm adhoc ,
+.Cm hostap ,
+.Cm wds ,
+and
+.Cm monitor
+mode operation.
+Only one
+.Cm hostap
+virtual interface may be configured at a time.
+Any number of 
+.Cm wds
+virtual interfaces may be configured together with a
+.Cm hostap
+interface.
+Multiple
+.Cm station
+interfaces may be operated together with a
+.Cm hostap
+interface to construct a wireless repeater device.
+For more information on configuring this device, see
+.Xr ifconfig 8 .
 .Sh HARDWARE
 The
 .Nm
@@ -163,22 +191,27 @@ An up to date list can be found at
 .Sh EXAMPLES
 Join an existing BSS network (i.e., connect to an access point):
 .Pp
-.Dl "ifconfig ral0 inet 192.168.0.20 netmask 0xffffff00"
+.Dl "ifconfig wlan create wlandev ral0 inet 192.168.0.20 netmask 0xffffff00"
 .Pp
 Join a specific BSS network with network name
 .Dq Li my_net :
 .Pp
-.Dl "ifconfig ral0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net"
+.Bd -literal -offset indent
+ifconfig wlan create wlandev ral0 inet 192.168.0.20 \e
+    netmask 0xffffff00 ssid my_net
+.Ed
 .Pp
 Join a specific BSS network with 40-bit WEP encryption:
 .Bd -literal -offset indent
-ifconfig ral0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
+ifconfig wlan create wlandev ral0 inet 192.168.0.20 \e
+    netmask 0xffffff00 ssid my_net \e
     wepmode on wepkey 0x1234567890 weptxkey 1
 .Ed
 .Pp
 Join a specific BSS network with 104-bit WEP encryption:
 .Bd -literal -offset indent
-ifconfig ral0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
+ifconfig wlan create wlandev ral0 inet 192.168.0.20 \e
+    netmask 0xffffff00 ssid my_net \e
     wepmode on wepkey 0x01020304050607080910111213 weptxkey 1
 .Ed
 .Sh DIAGNOSTICS
@@ -194,13 +227,16 @@ The driver will reset the hardware.
 This should not happen.
 .El
 .Sh SEE ALSO
-.Xr altq 4 ,
-.Xr arp 4 ,
+.Xr intro 4 ,
 .Xr cardbus 4 ,
-.Xr netintro 4 ,
-.Xr pci 4 ,
 .Xr wlan 4 ,
-.Xr ifconfig 8
+.Xr wlan_ccmp 4 ,
+.Xr wlan_tkip 4 ,
+.Xr wlan_wep 4 ,
+.Xr wlan_xauth 4 ,
+.Xr hostapd 8 ,
+.Xr ifconfig 8 ,
+.Xr wpa_supplicant 8 .
 .Rs
 .%T "Ralink Technology"
 .%O http://www.ralinktech.com/
@@ -210,17 +246,8 @@ The
 .Nm
 driver first appeared in
 .Ox 3.7 .
-.Sh CAVEATS
-PCI
-.Nm
-adapters seem to require a PCI 2.2 compliant motherboard and will likely not
-work with PCI 2.1 only motherboard.
-.Pp
-The
-.Nm
-driver does not implement frame aggregation.
 .Sh AUTHORS
-The
+The original
 .Nm
 driver was written by
 .An Damien Bergamini Aq damien@FreeBSD.org .
diff --git a/share/man/man4/rum.4 b/share/man/man4/rum.4
index ddb71a8..c34b245 100644
--- a/share/man/man4/rum.4
+++ b/share/man/man4/rum.4
@@ -16,7 +16,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 7, 2007
+.Dd April 13, 2008
 .Os
 .Dt RUM 4
 .Sh NAME
@@ -45,11 +45,11 @@ if_rum_load="YES"
 .Sh DESCRIPTION
 The
 .Nm
-driver supports USB 2.0 and PCI Express Mini Card wireless adapters based on the
-Ralink RT2501USB and RT2601USB chipsets.
+driver supports USB 2.0 and PCI Express Mini Card wireless adapters
+based on the Ralink RT2501USB and RT2601USB chipsets.
 .Pp
-Ralink PCI Express Mini Card adapters show up as normal USB 2.0 devices and are
-thus handled by the
+Ralink PCI Express Mini Card adapters show up as normal USB 2.0
+devices and are thus handled by the
 .Nm
 driver.
 .Pp
@@ -58,15 +58,27 @@ Ralink.
 It consists of two integrated chips, an RT2571W MAC/BBP and an RT2528 or
 RT5226 radio transceiver.
 .Pp
-The RT2601USB chipset consists of two integrated chips, an RT2671 MAC/BBP and
-an RT2527 or RT5225 radio transceiver.
-This chipset uses the MIMO (multiple-input multiple-output) technology with
-multiple antennas to extend the operating range of the adapter and to achieve
-higher throughput.
+The RT2601USB chipset consists of two integrated chips, an RT2671
+MAC/BBP and an RT2527 or RT5225 radio transceiver.
+This chipset uses the MIMO (multiple-input multiple-output) technology
+with multiple antennas to extend the operating range of the adapter
+and to achieve higher throughput.
+.Pp
+.Nm
+supports
+.Cm station ,
+.Cm adhoc ,
+.Cm hostap ,
+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 .
 .Sh HARDWARE
 The
 .Nm
-driver supports USB 2.0 and PCI Express Mini Card wireless
+driver supports USB 2.0 wireless
 adapters based on the Ralink RT2501USB and RT2601USB chipsets,
 including:
 .Pp
@@ -108,22 +120,25 @@ including:
 .Sh EXAMPLES
 Join an existing BSS network (i.e., connect to an access point):
 .Pp
-.Dl "ifconfig rum0 inet 192.168.0.20 netmask 0xffffff00"
+.Bd -literal -offset indent
+ifconfig wlan create wlandev rum0 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 rum0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net"
+.Dl "ifconfig wlan create wlandev rum0 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 rum0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
-    wepmode on wepkey 0x1234567890 weptxkey 1
+ifconfig wlan create wlandev rum0 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 rum0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
+ifconfig wlan create wlandev rum0 wlanmode adhoc ssid my_net \e
     wepmode on wepkey 0x01020304050607080910111213 weptxkey 1
 .Ed
 .Sh DIAGNOSTICS
@@ -135,13 +150,18 @@ The driver will reset the hardware.
 This should not happen.
 .El
 .Sh SEE ALSO
-.Xr altq 4 ,
-.Xr arp 4 ,
+.Xr intro 4 ,
 .Xr netintro 4 ,
 .Xr usb 4 ,
 .Xr wlan 4 ,
 .Xr wlan_amrr 4 ,
-.Xr ifconfig 8
+.Xr wlan_ccmp 4 ,
+.Xr wlan_tkip 4 ,
+.Xr wlan_wep 4 ,
+.Xr wlan_xauth 4 ,
+.Xr ifconfig 8 ,
+.Xr hostapd 8 ,
+.Xr wpa_supplicant 8 .
 .Rs
 .%T "Ralink Technology"
 .%O http://www.ralinktech.com/
@@ -151,16 +171,8 @@ The
 .Nm
 driver first appeared in
 .Ox 4.0 .
-.Sh CAVEATS
-.Pp
-The
-.Nm
-driver supports automatic control of the transmit speed in BSS mode only.
-Therefore the use of a
-.Nm
-adapter in Host AP mode is discouraged.
 .Sh AUTHORS
-The
+The original
 .Nm
 driver was written by
 .An Niall O'Higgins Aq niallo@openbsd.org
diff --git a/share/man/man4/ural.4 b/share/man/man4/ural.4
index b400838..453cfb4 100644
--- a/share/man/man4/ural.4
+++ b/share/man/man4/ural.4
@@ -15,7 +15,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 10, 2007
+.Dd April 13, 2008
 .Os
 .Dt URAL 4
 .Sh NAME
@@ -52,6 +52,18 @@ and a radio transceiver (the model of which depends on the card revision).
 The RT2522, RT2523, RT2524, RT2525, RT2525e and RT2526 radio transceivers
 operate in the 2.4GHz band (802.11b/g) whereas the RT5222 is a dual-band radio
 transceiver that can operate in the 2.4GHz and 5.2GHz bands (802.11a).
+.Pp
+.Nm
+supports
+.Cm station ,
+.Cm adhoc ,
+.Cm hostap ,
+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 .
 .Sh HARDWARE
 The
 .Nm
@@ -94,22 +106,25 @@ An up to date list can be found at
 .Sh EXAMPLES
 Join an existing BSS network (i.e., connect to an access point):
 .Pp
-.Dl "ifconfig ural0 inet 192.168.0.20 netmask 0xffffff00"
+.Bd -literal -offset indent
+ifconfig wlan create wlandev ural0 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 ural0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net"
+.Dl "ifconfig wlan create wlandev ural0 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 ural0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
-    wepmode on wepkey 0x1234567890 weptxkey 1
+ifconfig wlan create wlandev ural0 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 ural0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
+ifconfig wlan create wlandev ural0 wlanmode adhoc ssid my_net \e
     wepmode on wepkey 0x01020304050607080910111213 weptxkey 1
 .Ed
 .Sh DIAGNOSTICS
@@ -119,13 +134,18 @@ The driver will reset the hardware.
 This should not happen.
 .El
 .Sh SEE ALSO
-.Xr altq 4 ,
-.Xr arp 4 ,
+.Xr intro 4 ,
 .Xr netintro 4 ,
 .Xr usb 4 ,
 .Xr wlan 4 ,
 .Xr wlan_amrr 4 ,
-.Xr ifconfig 8
+.Xr wlan_ccmp 4 ,
+.Xr wlan_tkip 4 ,
+.Xr wlan_wep 4 ,
+.Xr wlan_xauth 4 ,
+.Xr ifconfig 8 ,
+.Xr hostapd 8 ,
+.Xr wpa_supplicant 8 .
 .Rs
 .%T "Ralink Technology"
 .%O http://www.ralinktech.com/
@@ -135,14 +155,8 @@ The
 .Nm
 driver first appeared in
 .Ox 3.7 .
-.Sh CAVEATS
-.Pp
-The
-.Nm
-driver does not support automatic adaptation of the transmit speed in IBSS
-and HostAP operating modes.
 .Sh AUTHORS
-The
+The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien@FreeBSD.org .
+.An Damien Bergamini Aq damien.bergamini@free.fr
diff --git a/share/man/man4/wi.4 b/share/man/man4/wi.4
index 2e35536..5a08527 100644
--- a/share/man/man4/wi.4
+++ b/share/man/man4/wi.4
@@ -31,12 +31,12 @@
 .\" $FreeBSD$
 .\"	$OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $
 .\"
-.Dd July 16, 2005
+.Dd April 13, 2008
 .Dt WI 4
 .Os
 .Sh NAME
 .Nm wi
-.Nd "Lucent Hermes, Intersil PRISM and Spectrum24 IEEE 802.11 driver"
+.Nd "Lucent Hermes, and Intersil PRISM IEEE 802.11 driver"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
@@ -55,74 +55,30 @@ if_wi_load="YES"
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for wireless network adapters based around
-the Lucent Hermes, Intersil PRISM-II, Intersil PRISM-2.5, Intersil
-Prism-3, and Symbol Spectrum24 chipsets.
-All five chipsets provide a similar interface to the driver.
-.Pp
-Supported features include 802.11 and 802.3 frames, power management, BSS,
-IBSS, WDS and old-style Lucent ad-hoc operation modes.
-Cards based on the Intersil PRISM chips also support a host-based
-access point mode which allows a card to act as a normal access point
-(with some assistance from the
-.Nm
-driver).
-The Lucent Hermes and Symbol Spectrum24 chipsets do not contain this
-functionality.
-The PRISM family of chips do not support the WDS functionality.
+driver provides support for 802.11b wireless network adapters based around
+the Lucent Hermes, Intersil PRISM-II, Intersil PRISM-2.5, and Intersil
+Prism-3 chipsets.
+All chipsets provide a similar interface to the driver.
+Only the Intersil chipsets support access point operation.
+Functionality, such as WPA support, depends on the specific version
+of the firmware used.
 All host/device interaction is via programmed I/O, even on those cards
 that support a DMA interface.
 .Pp
-The
-.Nm
-driver encapsulates all IP and ARP traffic as 802.11 frames, however
-it can receive either 802.11 or 802.3 frames.
-Transmit speed is selectable between 1Mbps, 2Mbps, 5.5 Mbps and 11Mbps
-depending on your hardware.
-Most hardware supports 11Mbps where the signal quality allows, but
-falls back to slower speeds when it does not.
-Except for the Lucent WaveLAN Bronze cards, all cards supported by the
-.Nm
-driver support WEP for encryption.
-To enable encryption, use
-.Xr ifconfig 8
-as shown below.
-.Pp
-By default, the
-.Nm
-driver configures the card for BSS operation (aka infrastructure
-mode).
-This mode requires the use of an access point (base station).
+For more information on configuring this device, see
+.Xr ifconfig 8 .
 .Pp
-The
 .Nm
-driver also supports a point-to-point mode
-where stations can communicate amongst themselves without the
-aid of an access point.
-Note that there are two possible point-to-point modes.
-One mode, referred to as
-.Dq "ad-hoc demo mode" ,
-or
-.Dq "legacy Lucent ad-hoc mode" ,
-predates the IEEE 802.11 specification and so may not interoperate
-with cards from different vendors.
-The standardized point-to-point mode is called IBSS (or confusingly
-just ad-hoc mode), but is not supported by cards with very old
-firmware revisions.
-If your cards supports IBSS mode, it is recommended that you use it in
-preference to the
-.Dq "ad-hoc demo mode"
-in new installations.
-.Pp
-Cards supported by the driver based on the Intersil PRISM family of chips also
-have a host-based access point mode which allows the card to
-act as an access point (base station).
-Access points are different than operating in IBSS mode.
-They operate in BSS mode.
-They allow for easier roaming and bridge all Ethernet traffic such
-that machines connected via an access point appear to be on the local
-Ethernet segment.
-.Pp
+supports
+.Cm station ,
+.Cm adhoc ,
+.Cm adhoc-demo ,
+.Cm hostap ,
+and
+.Cm monitor
+mode operation.
+Only one
+virtual interface may be configured at a time.
 For more information on configuring this device, see
 .Xr ifconfig 8 .
 .Pp
@@ -151,7 +107,6 @@ driver:
 .Pp
 .Bl -column -compact "Linksys Instant Wireless WPC11 2.5" "Spectrum24" "PCI or PCMCIA"
 .Em "Card	Chip	Bus"
-3Com AirConnect 3CRWE737A	Spectrum24	PCMCIA
 3Com AirConnect 3CRWE777A	Prism-II	PCI
 Accton airDirect WN3301		PCMCIA
 ACTIONTEC HWC01170	Prism-2.5	PCMCIA
@@ -191,7 +146,6 @@ ELSA MC-11		PCMCIA
 ELSA XI300	Prism-II	PCMCIA
 ELSA XI800	Prism-II	CF
 EMTAC A2424i	Prism-II	PCMCIA
-Ericsson Wireless LAN CARD C11	Spectrum24	PCMCIA
 Farallon Skyline	Prism-II	PCMCIA
 Gemtek WL-311	Prism-2.5	PCMCIA
 Hawking Technology WE110P	Prism-2.5	PCMCIA
@@ -199,7 +153,6 @@ Home Wireless Networks	Prism-II	PCMCIA
 IBM High Rate Wireless	Hermes	PCMCIA
 ICOM SL-1100	Prism-II	PCMCIA
 I-O DATA WN-B11/PCM	Prism-II	PCMCIA
-Intel PRO/Wireless 2011	Spectrum24	PCMCIA
 Intersil Prism II	Prism-II	PCMCIA
 Intersil Mini-PCI	Prism-2.5	PCI
 Intersil ISL37100P	Prism-3	PCMCIA
@@ -240,8 +193,6 @@ SMC 2632 EZ Connect	Prism-II	PCMCIA
 Socket Low Power WLAN-CF	Prism-II	CF
 Sony PCWA-C100	Lucent	PCMCIA
 Sony PEGA-WL110	Prism-2.5	PCMCIA
-Symbol Spectrum24	Spectrum24	PCMCIA
-Symbol LA-4100	Spectrum24	CF
 TDK LAK-CD011WL	Prism-II	PCMCIA
 Toshiba Wireless LAN Card	Prism-II	PCMCIA
 U.S.\& Robotics Wireless Card 2410	Prism-II	PCMCIA
@@ -284,52 +235,53 @@ DLink DWL520
 .Sh EXAMPLES
 Join an existing BSS network (ie: connect to an access point):
 .Pp
-.Dl "ifconfig wi0 inet 192.168.0.20 netmask 0xffffff00"
+.Bd -literal -offset indent
+ifconfig wlan create wlandev wi0 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 wi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net"
+.Bd -literal -offset indent
+ifconfig wlan create wlandev wi0 inet 192.168.0.20 \e
+    netmask 0xffffff00 ssid my_net
 .Pp
 Join a specific BSS network with WEP encryption:
 .Bd -literal -offset indent
-ifconfig wi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
-	wepmode on wepkey 0x8736639624
+ifconfig wlan create wlandev wi0 inet 192.168.0.20 \e
+    netmask 0xffffff00 ssid my_net \e
+    wepmode on wepkey 0x8736639624 weptxkey 1
 .Ed
 .Pp
 Join a Lucent legacy demo ad-hoc network with network name
 .Dq Li my_net :
 .Bd -literal -offset indent
-ifconfig wi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e
-	media DS/11Mbps mediaopt adhoc,link0
+ifconfig wlan create wlandev wi0 wlanmode ahdemo \e
+    inet 192.168.0.20 netmask 0xffffff00 ssid my_net
 .Ed
 .Pp
 Join/create an IBSS network with network name
 .Dq Li my_net :
 .Bd -literal -offset indent
-ifconfig wi0 inet 192.168.0.22 netmask 0xffffff00 ssid my_net \e
-	media DS/11Mbps mediaopt adhoc
+ifconfig wlan create wlandev wi0 wlanmode adhoc wi0 \e
+    inet 192.168.0.22 netmask 0xffffff00 ssid my_net
 .Ed
 .Pp
 Create a host-based access point (Prism only):
 .Bd -literal -offset indent
-ifconfig wi0 inet 192.168.0.10 netmask 0xffffff00 ssid my_ap \e
-	media DS/11Mbps mediaopt hostap
+ifconfig wlan create wlandev wi0 wlanmode hostap \e
+    inet 192.168.0.10 netmask 0xffffff00 ssid my_ap
 .Ed
 .Pp
-Create a host-based access point with WEP enabled (Prism only):
+Create a host-based access point with WEP enabled (Prism only)
+and plumb it into bridge to fxp0:
 .Bd -literal -offset indent
-ifconfig wi0 inet 192.168.0.10 netmask 0xffffff00 ssid my_ap \e
-	wepmode on wepkey 0x1234567890 media DS/11Mbps \e
-	mediaopt hostap
-.Ed
-.Pp
-Create a host-based wireless bridge to fxp0 (Prism only):
-.Bd -literal -offset indent
-ifconfig wi0 inet up ssid my_ap media DS/11Mbps mediaopt hostap
-sysctl net.inet.ip.check_interface=0
+ifconfig wlan0 create wlandev wi0 wlanmode hostap \e
+    inet 192.168.0.10 netmask 0xffffff00 ssid my_ap \e
+    wepmode on wepkey 0x1234567890 weptxkey 1
 ifconfig bridge0 create
-ifconfig bridge0 addm wi0 addm fxp0 up
+ifconfig bridge0 addm wlan0 addm fxp0 up
 .Ed
 .Pp
 This will give you the same functionality as an access point.
@@ -347,16 +299,18 @@ The WaveLAN card failed to generate an interrupt to acknowledge a transmit
 command.
 .El
 .Sh SEE ALSO
-.Xr altq 4 ,
-.Xr an 4 ,
-.Xr arp 4 ,
-.Xr ath 4 ,
-.Xr netintro 4 ,
+.Xr intro 4 ,
 .Xr pccard 4 ,
 .Xr pccbb 4 ,
 .Xr pcic 4 ,
 .Xr wlan 4 ,
+.Xr wlan_ccmp 4 ,
+.Xr wlan_tkip 4 ,
+.Xr wlan_wep 4 ,
+.Xr wlan_xauth 4 ,
+.Xr hostapd 8 ,
 .Xr ifconfig 8 ,
+.Xr wpa_supplicant 8 .
 .Rs
 .%T HCF Light programming specification
 .%O http://www.wavelan.com
@@ -367,24 +321,21 @@ The
 device driver first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-The
+The original
 .Nm
 driver was written by
 .An Bill Paul Aq wpaul@ctr.columbia.edu .
 This man page comes from
 .Ox .
 .Sh CAVEATS
-Different regulatory domains have different default channels for adhoc
-mode.
-See
-.Xr ifconfig 8
-for information on how to change the channel.
-The Intersil Prism family of chips' host-based access point mode has
-bugs for station firmware versions prior to 0.8.3.
-The driver currently precludes hostap functionality with older station
-firmware.
-The best version of the station firmware for the Prism family of chips
-seems to be 1.4.9.
+The driver will reject devices with old firmware to
+avoid dealing with numerous defects.
+Unfortunately the driver does not support downloading new firmware
+to the card so if new firmware is needed users will have to boot
+a different system to accomplish this.
+.Pp
+Intersil Prism cards must have firmware versions 0.8.0 or later and
+version 1.7.0 or later are required to support functionality such as WPA.
 Some users of Prism-II and 2.5 based cards report that station firmware
 version 1.3.4 works better for them in hostap than 1.4.9.
 Older versions of the Prism station firmware have a number of issues
@@ -394,15 +345,8 @@ later.
 The IBSS/adhoc mode appears to have problems for some people with
 older versions of station firmware.
 .Pp
-Lucent cards prior to firmware version 6.0.6 do not support IBSS
-mode.
-These cards support only the pre-802.11 mode known as
-.Dq "demo ad-hoc mode"
-which does not interoperate with stations in IBSS mode.
-.Pp
-Prism cards prior to version 0.8.0 do not support IBSS mode.
-.Pp
-Symbol cards prior to version 2.50.00 do not support IBSS mode.
+Lucent cards prior to firmware version 6.0.6 do not implement IBSS
+mode and are not supported.
 .Sh BUGS
 Not all the new messages are documented here, and many of them are
 indications of transient errors that are not indications of serious
diff --git a/share/man/man4/wlan.4 b/share/man/man4/wlan.4
index d636395..6bfad82 100644
--- a/share/man/man4/wlan.4
+++ b/share/man/man4/wlan.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 6, 2007
+.Dd April 12, 2008
 .Dt WLAN 4
 .Os
 .Sh NAME
@@ -41,50 +41,96 @@ Where a device does not directly support 802.11 functionality
 this layer fills in.
 The
 .Nm
-is required for the
-.Xr an 4 ,
-.Xr ath 4 ,
-.Xr ipw 4 ,
-.Xr iwi 4 ,
-.Xr ral 4 ,
-.Xr rum 4 ,
-.Xr ural 4 ,
-.Xr wi 4 ,
-.Xr wpi 4 ,
-and
-.Xr zyd 4
-drivers, with other drivers to follow.
+module is required by all native 802.11 drivers as well as the
+.Xr ndis 4
+support.
 .Pp
-The
 .Nm
-module supports multi-mode devices capable of
+supports multi-mode devices capable of
 operating in both 2.4GHz and 5GHz bands and supports numerous
-802.11 protocols: 802.11a, 802.11b, and 802.11g.
+802.11 standards: 802.11a, 802.11b, 802.11g, and 802.11n.
 The WPA, 802.11i, and 802.1x security protocols are supported
 through a combination of in-kernel code and user-mode applications.
-The WME and WMM multi-media protocols are supported entirely within
+The WME/WMM multi-media protocols are supported entirely within
 the
 .Nm
 module but require a suitably capable hardware device.
+Likewise the 802.11h specification is supported only by suitably
+capable devices.
 .Pp
-The
+Drivers provide 802.11 functionality through
+.Nm
+interfaces that are created at runtime using interface cloning.
+This is done with the
+.Xr ifconfig 8
+.Cm create
+command or using the
+.Va vaps_IFX
+variable in
+.Xr rc.conf 5 .
+Some drivers support the creation of multiple
+.Nm
+interfaces that share the same underlying device;
+this is the way by which ``multi-bss support'' is provided but it
+can also be used to create WDS links and other interesting applications.
+.Pp
+There are several types of
 .Nm
-module defines several mechanisms by which plugin modules may
-be used to extend functionality.
+interfaces that may be created:
+.Bl -tag -width monitor
+.It Cm sta
+A client station in an infrastructure bss
+(i.e. one that associates to an access point).
+.It Cm hostap
+An access point in an infrastructure bss.
+.It Cm adhoc
+A station in an IBSS network.
+.It Cm ahdemo
+A station operating in ``adhoc demo mode''.
+This is essentially an IBSS station that does not use management
+frames (e.g. no beacons are transmitted).
+An
+.Cm ahdemo
+interface is especially useful for applications that want to transmit
+and receive raw 802.11 packets.
+.It Cm monitor
+An interface used exclusively for capturing 802.11 frames.
+In particular this specified to have read-only properties
+which enables it to be operated on frequencies where one
+would otherwise not be allowed.
+.It Cm wds
+A station that passes 4-address 802.11 traffic for the purpose
+of tunneling traffic over a wireless link.
+Typically this station would share the same MAC address as a
+.Cm hostap
+interface.
+It may be possible to create
+.Cm wds
+interfaces without a companion
+.Cm hostap
+interface but that is not guaranteed; one may need to create a
+.Cm hostap
+interface that does not send beacon frames before
+.Cm wds
+interfaces may be created.
+.El
+.Pp
+More types are planned to support
+802.11s mesh nodes (station and ap).
+Note that an interface's type cannot be changed once it is created.
+.Pp
+.Nm
+defines several mechanisms by which plugin modules may
+be used to extend its' functionality.
 Cryptographic support such as WEP, TKIP, and AES-CCMP are implemented
-as modules that are loaded on demand (if not statically configured
-into a system).
+as standalone modules (if not statically configured into a system)
+that register with
+.Nm .
 Similarly there is an authenticator framework for defining 802.11
 authentication services and a framework for integrating access
 control mechanisms specific to the 802.11 protocol.
 .Sh DEBUGGING
-If the associated interface is marked for debugging with, for example,
-.Pp
-.Dl "ifconfig wi0 debug"
-.Pp
-then messages describing the operation of the 802.11 protocol will
-be sent to the console.
-Complete debugging controls are available using:
+Debugging controls are available using:
 .Pp
 .Dl "sysctl net.wlan.X.debug=mask"
 .Pp
@@ -101,19 +147,15 @@ For example,
 enables debugging messages related to scanning for an access point,
 adhoc neighbor, or an unoccupied channel when operation as an access point.
 The
-.Xr 80211debug
+.Xr wlandebug 8
 tool provides a more user-friendly mechanism for doing the same thing.
+Note that
 .Pp
-Many drivers will also display the contents of each 802.11 frame
-sent and received when the interface is marked with
-both debugging and
-.Cm link2 ;
-e.g.,
+.Dl "sysctl net.wlan.debug=mask"
 .Pp
-.Dl "ifconfig wi0 debug link2"
-.Pp
-Beware however that some management frames may be processed entirely within
-the device and not be received by the host.
+defines the initial value of the debugging flags for each cloned
+.Nm
+interface; this is useful to enable debug messages during interface creation.
 .Sh COMPATIBILITY
 The module name of
 .Nm
@@ -122,8 +164,11 @@ was used to be compatible with
 .Sh SEE ALSO
 .Xr an 4 ,
 .Xr ath 4 ,
+.Xr bwi 4 ,
 .Xr ipw 4 ,
 .Xr iwi 4 ,
+.Xr iwn 4 ,
+.Xr mwl 4 ,
 .Xr netintro 4 ,
 .Xr ral 4 ,
 .Xr rum 4 ,
@@ -137,7 +182,7 @@ was used to be compatible with
 .Xr wpi 4 ,
 .Xr zyd 4
 .Sh STANDARDS
-More information can be found in the IEEE 802.11 Standard.
+More information can be found in the IEEE 802.11 Standards.
 .Sh HISTORY
 The
 .Nm
@@ -152,7 +197,8 @@ software from which this work began.
 brought the code into
 .Fx
 and then rewrote it to support multi-mode devices,
-802.11g, WPA/802.11i, WME, and add the extensible frameworks
+802.11g, 802.11n, WPA/802.11i, WME, multi-bss, and
+add the extensible frameworks
 for cryptographic, authentication, and access control plugins.
 This manual page was written by
 .An Tom Rhodes Aq trhodes@FreeBSD.org .
diff --git a/share/man/man4/wlan_acl.4 b/share/man/man4/wlan_acl.4
index 1a95441..9a05aad 100644
--- a/share/man/man4/wlan_acl.4
+++ b/share/man/man4/wlan_acl.4
@@ -40,12 +40,11 @@ module implements a MAC-based access control plugin for use
 with 802.11 devices operating as an access point.
 The
 .Nm
-module is an 802.11 access control plugin module for use with the
-.Xr wlan 4
-module.
-This module is automatically loaded if an application configures
-an access control policy for an 802.11 device operating as an access
-point.
+must be loaded for 
+.Xr ifconfig 8
+to handle the
+.Cm mac:*
+requests.
 .Sh SEE ALSO
 .Xr wlan 4 ,
 .Xr ifconfig 8
diff --git a/share/man/man4/wlan_amrr.4 b/share/man/man4/wlan_amrr.4
index 2883b7a..f810a9c 100644
--- a/share/man/man4/wlan_amrr.4
+++ b/share/man/man4/wlan_amrr.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 10, 2007
+.Dd April 13, 2008
 .Dt WLAN_AMRR 4
 .Os
 .Sh NAME
@@ -37,15 +37,15 @@
 The
 .Nm
 module implements the Adaptive Multi-Rate Retry tx rate control
-algorithm for use with 802.11 devices.
-The
-.Nm
-module is an 802.11 tx rate control module for use by the
-device-independent implementation.
+algorithm for use by 802.11 device drivers.
 .Sh SEE ALSO
+.Xr bwi 4 ,
+.Xr iwn 4 ,
+.Xr ral 4 ,
 .Xr rum 4 ,
 .Xr ural 4 ,
 .Xr wlan 4 ,
+.Xr wpi 4 ,
 .Xr zyd 4
 .Sh STANDARDS
 More information can be found in the paper describing the 
diff --git a/share/man/man4/wlan_xauth.4 b/share/man/man4/wlan_xauth.4
index cf806a9..b1fdfc5 100644
--- a/share/man/man4/wlan_xauth.4
+++ b/share/man/man4/wlan_xauth.4
@@ -36,7 +36,9 @@
 .Sh DESCRIPTION
 The
 .Nm
-module implements an authenticator plugin that is intended
+module is a
+.Xr wlan 4
+authenticator plugin
 for use with user-mode authentication implementations such
 as
 .Nm hostapd .
@@ -44,13 +46,10 @@ It hooks into the 802.11 layer and does nothing.
 As a result, 802.11 stations that associate are not authorized to
 send or receive frames until they are authorized by an external agent;
 typically using a protocol such as WPA, 802.1x, or 802.11i.
-The
-.Nm
-module is an 802.11 authenticator plugin module for use by the
-.Xr wlan 4
-module.
-This module is automatically loaded if an application configures
-an 802.11 device for operation as an AP with WPA or 802.1x authentication.
+.Pp
+This module is automatically loaded by the rc script that normally
+starts
+.Xr hostapd 8 .
 .Sh SEE ALSO
 .Xr wlan 4
 .Sh STANDARDS
diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4
index bc6e796..c573856 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 .
diff --git a/share/man/man4/zyd.4 b/share/man/man4/zyd.4
index 6599a53..23eb9c6 100644
--- a/share/man/man4/zyd.4
+++ b/share/man/man4/zyd.4
@@ -32,7 +32,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 6, 2007
+.Dd Apri 13, 2008
 .Dt ZYD 4
 .Os
 .Sh NAME
@@ -64,34 +64,16 @@ The
 driver provides support for wireless network adapters based around
 the ZyDAS ZD1211 and ZD1211B USB chips.
 .Pp
-These are the modes the
 .Nm
-driver can operate in:
-.Bl -tag -width "IBSS-masterXX"
-.It BSS mode
-Also known as
-.Em infrastructure
-mode, this is used when associating with an access point, through
-which all traffic passes.
-This mode is the default.
-.It monitor mode
-In this mode the driver is able to receive packets without
-associating with an access point.
-This disables the internal receive filter and enables the card to
-capture packets from networks which it wouldn't normally have access to,
-or to scan for access points.
-.El
-.Pp
-.Nm
-supports software WEP.
-Wired Equivalent Privacy (WEP) is the de facto encryption standard
-for wireless networks.
-It can be typically configured in one of three modes:
-no encryption; 40-bit encryption; or 104-bit encryption.
-Unfortunately, due to serious weaknesses in WEP protocol
-it is strongly recommended that it not be used as the
-sole mechanism to secure wireless communication.
-WEP is not enabled by default.
+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 .
 .Sh HARDWARE
 The following devices are known to be supported by the
 .Nm
@@ -143,24 +125,20 @@ driver:
 .El
 .Sh EXAMPLES
 The following
-examples configures zyd0 to join whatever network is available on boot,
-using WEP key
+examples configures zyd0 to join any BSS network using WEP key
 .Dq 0x1deadbeef1 ,
 channel 11:
 .Bd -literal -offset indent
-inet 192.168.1.1 netmask 255.255.255.0 wepkey 0x1deadbeef1 channel 11
-.Ed
-.Pp
-Configure zyd0 for WEP, using hex key
-.Dq 0x1deadbeef1 :
-.Bd -literal -offset indent
-# ifconfig zyd0 wepkey 0x1deadbeef1
+ifconfig wlan create wlandev zyd0 channel 11 \e
+    wepmode on wepkey 0x1deadbeef1 weptxkey 1 \e
+    inet 192.168.1.1 netmask 255.255.255.0
 .Ed
 .Pp
 Join an existing BSS network,
 .Dq my_net :
 .Bd -literal -offset indent
-# ifconfig zyd0 192.168.0.2 netmask 0xffffff00 ssid my_net
+ifconfig wlan create wlandev zyd0 192.168.0.2 \e
+    netmask 0xffffff00 ssid my_net
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
@@ -181,16 +159,19 @@ The driver will reset the hardware.
 This should not happen.
 .El
 .Sh SEE ALSO
-.Xr arp 4 ,
 .Xr intro 4 ,
 .Xr netintro 4 ,
 .Xr usb 4 ,
 .Xr wlan 4 ,
 .Xr wlan_amrr 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 Florian Stoehr Aq ich@florian-stoehr.de ,
diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
index 3e1d832..12ee000 100644
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -55,6 +55,7 @@ MAN=	acct.5 \
 	protocols.5 \
 	quota.user.5 \
 	rc.conf.5 \
+	regdomain.5 \
 	reiserfs.5 \
 	remote.5 \
 	resolver.5 \
diff --git a/share/man/man5/regdomain.5 b/share/man/man5/regdomain.5
new file mode 100644
index 0000000..f46a4af
--- /dev/null
+++ b/share/man/man5/regdomain.5
@@ -0,0 +1,48 @@
+.\" Copyright (c) 2008 Sam Leffler, Errno Consulting
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (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$
+.Dd Apri 13, 2008
+.Dt REGDOMAIN 5
+.Os
+.Sh NAME
+.Nm regdomain.xml
+.Nd "802.11 wireless regulatory definitions"
+.Sh DESCRIPTION
+The
+.Nm
+file describes regulations for the operation of IEEE 802.11 wireless radios.
+.Pp
+This information is used by the
+.Xr ifconfig 8
+program to construct regulatory state for download to the system.
+This file should be changed only to reflect changes in regulations.
+.Sh FILES
+.Bl -tag -width /etc/regdomain.xml -compact
+.It Pa /etc/regdomain.xml
+XML database of 802.11 regulatory constraints
+.El
+.Sh SEE ALSO
+.Xr wlan 4
+.Xr ifconfig 8 ,