11 files changed, 1660 insertions, 463 deletions

diff --git a/share/man/man4/an.4 b/share/man/man4/an.4
index f866ba9ad75..8d44e52c483 100644
--- a/share/man/man4/an.4
+++ b/share/man/man4/an.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: an.4,v 1.27 2005/02/24 15:14:55 jmc Exp $
+.\"	$OpenBSD: an.4,v 1.28 2005/03/06 21:49:00 jmc Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -37,7 +37,7 @@
 .Os
 .Sh NAME
 .Nm an
-.Nd Aironet Communications 4500/4800 IEEE 802.11B wireless network adapter
+.Nd Aironet Communications 4500/4800 IEEE 802.11FH/b wireless network driver
 .Sh SYNOPSIS
 .Cd "an* at pcmcia?"
 .Cd "an* at pci?"
@@ -47,10 +47,10 @@ The
 .Nm
 driver provides support for the Aironet Communications 4500, 4800
 (aka Cisco 340), and Cisco 350
-IEEE 802.11 Direct Sequence wireless network adapters.
+IEEE 802.11 wireless network adapters.
 This includes the ISA, PCI, and PCMCIA varieties.
-The 4500 series adapters operate at 1 and 2Mbps while
-the 4800 and 350 series can operate at 1, 2, 5.5, and 11Mbps.
+The 4500 series adapters operate at 1 and 2Mbps (FH) while
+the 4800 and 350 series can operate at 1, 2, 5.5, and 11Mbps (DS).
 The ISA, PCI,
 and PCMCIA devices are all based on the same core PCMCIA modules
 and all have the same programming interface.
@@ -73,31 +73,72 @@ require no switch settings of any kind and will be automatically
 probed and attached.
 .Pp
 All host/device interaction with the Aironet cards is via programmed I/O.
-The Aironet devices support 802.11 and 802.3 frames, power management,
-BSS (infrastructure), and IBSS (ad-hoc) operation modes.
 The
 .Nm
-driver encapsulates all IP and ARP traffic as 802.11 frames, however,
+driver encapsulates all IP and ARP traffic as 802.11 frames, though
 it can receive either 802.11 or 802.3 frames.
-Transmit speed is
-selectable between 1Mbps, 2Mbps, 5.5Mbps, 11Mbps or
-"auto" (the NIC automatically chooses the best speed).
 .Pp
-By default, the
+These are the modes the
 .Nm
-driver configures the card for BSS operation (aka infrastructure mode).
-This mode requires the use of an access point (base station).
+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 IBSS mode
+Also known as
+.Em IEEE ad-hoc
+mode or
+.Em peer-to-peer
+mode.
+This is the standardized method of operating without an access point.
+Stations associate with a service set.
+However, actual connections between stations are peer-to-peer.
+.El
 .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.
+supports hardware 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.
 .Pp
-For more information on configuring this device, see
+The
+.Nm
+driver can be configured using
 .Xr ancontrol 8
-and
-.Xr ifconfig 8 .
+or on boot with
+.Xr hostname.if 5 .
+.Sh EXAMPLES
+Note that when setting options via
+.Xr ancontrol 8
+in a
+.Xr hostname.if 5
+file (e.g.\&
+.Pa /etc/hostname.an0 ) ,
+the
+.Xr ancontrol 8
+commands should be specified first.
+.Pp
+The following
+.Xr hostname.if 5
+example will set the channel to 11 and enable WEP before configuring
+the interface as an IBSS peer:
+.Bd -literal -offset indent
+!/sbin/ancontrol \e$if -c 11 -W 1 -k 0x1deadbeef1 -n my_net -o 0
+inet 192.168.1.1 255.255.255.0 NONE
+.Ed
+.Pp
+Enable WEP:
+.Pp
+.Dl # ancontrol an0 -W 1
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "an%d: init failed"
@@ -112,6 +153,7 @@ command.
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
+.Xr ifmedia 4 ,
 .Xr intro 4 ,
 .Xr isapnp 4 ,
 .Xr netintro 4 ,
@@ -137,3 +179,7 @@ and ported to
 .Ox
 by
 .An Michael Shalayeff Aq mickey@openbsd.org .
+.Sh CAVEATS
+.Nm
+is not configurable with
+.Xr ifconfig 8 .
diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4
index 162e53f8c9e..20443db17ef 100644
--- a/share/man/man4/ath.4
+++ b/share/man/man4/ath.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ath.4,v 1.14 2005/02/25 22:31:31 reyk Exp $
+.\"	$OpenBSD: ath.4,v 1.15 2005/03/06 21:49:00 jmc Exp $
 .\"     $NetBSD: ath.4,v 1.5 2004/07/03 16:58:18 mycroft Exp $
 .\"
 .\" Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -47,7 +47,7 @@
 .Os
 .Sh NAME
 .Nm ath
-.Nd Atheros IEEE 802.11A/B/G wireless network adapter
+.Nd Atheros IEEE 802.11a/b/g wireless network driver
 .Sh SYNOPSIS
 .Cd "ath* at pci? dev ? function ?"
 .Cd "ath* at cardbus? dev ? function ?"
@@ -55,16 +55,13 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for wireless network adapters based on
-the Atheros AR5210, AR5211 and AR5212 chips.
+driver provides support for wireless network devices based on
+the Atheros AR5210, AR5211, and AR5212 chips.
 .Pp
-Supported features include 802.11 and 802.3 frames, power management, BSS,
-IBSS, and host-based access point operation modes.
 All host/device interaction is via DMA.
-.Pp
 The
 .Nm
-driver encapsulates all IP and ARP traffic as 802.11 frames, however
+driver encapsulates all IP and ARP traffic as 802.11 frames, though
 it can receive either 802.11 or 802.3 frames.
 Transmit speed and operating mode is selectable and
 depends on the specific chipset.
@@ -72,12 +69,13 @@ depends on the specific chipset.
 AR5210-based devices support 802.11a operation with transmit speeds
 of 6 Mbps, 9 Mbps, 12 Mbps, 18 Mbps, 24 Mbps, 36 Mbps, 48 Mbps, and 54 Mbps.
 .Pp
-AR5211-based devices support 802.11a and 802.11b operation
-with transmit speeds appropriate to each.
+AR5211-based devices support 802.11a and 802.11b operation with
+transmit speeds as above for 802.11a and
+1Mbps, 2Mbps, 5.5 Mbps, and 11Mbps for 802.11b operation.
 .Pp
-AR5212-based devices support 802.11a, 802.11b and 802.11g operation with
-transmit speeds as above for 802.11a and 802.11g operation and
-1Mbps, 2Mbps, 5.5 Mbps and 11Mbps for 802.11b operation.
+AR5212-based devices support 802.11a, 802.11b, and 802.11g operation with
+transmit speeds as above for 802.11a, 802.11b, and 802.11g operation
+(802.11g speeds are the same as for 802.11a speeds).
 .Pp
 All chips also support an Atheros Turbo Mode (TM) that operates in the
 802.11a frequency range with 2x the transmit speeds.
@@ -86,34 +84,195 @@ All chips also support an Atheros Turbo Mode (TM) that operates in the
 The actual transmit speed used is dependent on signal quality and the
 .Dq rate control
 algorithm employed by the driver.
-All chips support WEP encryption.
-AR5211 and AR5212 support the AES, TKIP, and Michael cryptographic
-operations required for WPA but at this time the driver does not support them.
-To enable encryption, use
-.Xr ifconfig 8 .
 .Pp
-By default, the
+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 IBSS mode
+Also known as
+.Em IEEE ad-hoc
+mode or
+.Em peer-to-peer
+mode.
+This is the standardized method of operating without an access point.
+Stations associate with a service set.
+However, actual connections between stations are peer-to-peer.
+.It Host AP
+In this mode the adapter acts as an access point (base station)
+for other cards.
+.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
-driver configures the card for BSS operation (aka infrastructure
-mode).
-This mode requires the use of an access point (base station).
+supports hardware 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.
 .Pp
+AR5211 and AR5212 support the AES, TKIP, and Michael cryptographic
+operations required for WPA but at this time the driver does not support them.
+.Sh CONFIGURATION
+The
+.Nm
+driver can be configured at runtime with
+.Xr ifconfig 8
+or on boot with
+.Xr hostname.if 5
+using the following parameters:
+.Bl -tag -width Ds
+.It Cm bssid Ar bssid
+Set the desired BSSID.
+.It Fl bssid
+Unset the desired BSSID.
+The interface will automatically select a BSSID in this mode, which is
+the default.
+.It Cm chan Ar n
+Set the channel (radio frequency) to be used by the driver based on
+the given channel ID
+.Ar n .
+.It Fl chan
+Unset the desired channel to be used by the driver.
+The driver will automatically select a channel in this mode, which is
+the default.
+.It Cm media Ar media
 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.
+driver supports the following
+.Ar media
+types:
 .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).
-In hostap mode access points 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.
+.Bl -tag -width autoselect -compact
+.It Cm autoselect
+Enable autoselection of the media type and options.
+.It Cm DS1
+Set 802.11b DS 1Mbps operation.
+.It Cm DS2
+Set 802.11b DS 2Mbps operation.
+.It Cm DS5
+Set 802.11b DS 5.5Mbps operation.
+.It Cm DS11
+Set 802.11b DS 11Mbps operation.
+.It Cm OFDM6
+Set 802.11g OFDM 6Mbps operation.
+.It Cm OFDM9
+Set 802.11g OFDM 9Mbps operation.
+.It Cm OFDM12
+Set 802.11g OFDM 12Mbps operation.
+.It Cm OFDM18
+Set 802.11g OFDM 18Mbps operation.
+.It Cm OFDM24
+Set 802.11g OFDM 24Mbps operation.
+.It Cm OFDM36
+Set 802.11g OFDM 36Mbps operation.
+.It Cm OFDM48
+Set 802.11g OFDM 48Mbps operation.
+.It Cm OFDM54
+Set 802.11g OFDM 54Mbps operation.
+.El
+.It Cm mediaopt Ar opts
+The
+.Nm
+driver supports the following media options:
 .Pp
-For more information on configuring this device, see
-.Xr ifconfig 8 .
+.Bl -tag -width monitor -compact
+.It Cm hostap
+Select Host AP operation.
+.It Cm ibss
+Select IBSS operation.
+.It Cm monitor
+Select monitor mode.
+.It Cm turbo
+Select turbo mode.
+.El
+.It Fl mediaopt Ar opts
+Disable the specified media options on the driver and returns it to the
+default mode of operation (BSS).
+.It Cm mode Ar mode
+The
+.Nm
+driver supports the following modes:
 .Pp
+.Bl -tag -width 11b -compact
+.It Cm 11a
+Force 802.11a operation.
+.It Cm 11b
+Force 802.11b operation.
+.It Cm 11g
+Force 802.11g operation.
+.El
+.It Cm nwid Ar id
+Set the network ID.
+The
+.Ar id
+can either be any text string up to 32 characters in length,
+or a series of hexadecimal digits up to 64 digits.
+An empty
+.Ar id
+string allows the interface to connect to any available access points.
+By default the
+.Nm
+driver uses an empty string.
+.It Cm nwkey Ar key
+Enable WEP encryption using the specified
+.Ar key .
+The
+.Ar key
+can either be a string, a series of hexadecimal digits (preceded by
+.Sq 0x ) ,
+or a set of keys of the form
+.Dq n:k1,k2,k3,k4 ,
+where
+.Sq n
+specifies which of the keys will be used for transmitted packets,
+and the four keys,
+.Dq k1
+through
+.Dq k4 ,
+are configured as WEP keys.
+If a set of keys is specified, a comma
+.Pq Sq \&,
+within the key must be escaped with a backslash.
+Note that if multiple keys are used, their order must be the same within
+the network.
+.Nm
+is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
+or 104-bit (13 characters or 26 hexadecimal digits) keys.
+.It Fl nwkey
+Disable WEP encryption.
+This is the default mode of operation.
+.It Cm nwkey persist
+Enable WEP encryption with the persistent key stored in the network card.
+.It Cm nwkey persist : Ns Ar key
+Write
+.Ar key
+to the persistent memory of the network card,
+and enable WEP encryption using that key.
+.It Cm powersave
+Enable power saving mode.
+.It Fl powersave
+Disable power saving mode.
+This is the default mode of operation.
+.It Cm powersavesleep Ar duration
+Set the receiver sleep duration (in milliseconds) for power saving mode.
+.El
+.Sh HARDWARE
 Devices supported by the
 .Nm
 driver come in either CardBus or mini-PCI packages.
@@ -123,8 +282,9 @@ The following cards are among those supported by the
 .Nm
 driver:
 .Pp
-.Bl -column -compact "Samsung SWL-5200N" "AR5212" "CardBus" "a/b/g"
+.Bl -column -compact "Samsung SWL-5200N" "AR5212" "CardBus" "a/b/g" -offset 6n
 .Em "Card	Chip	Bus	Standard"
+3Com 3CRPAG175	AR5212	Cardbus	a/b/g
 Aztech WL830PC	AR5212	CardBus	b/g
 D-Link DWL-A650	AR5210	CardBus	a
 D-Link DWL-AB650	AR5211	CardBus	a/b
@@ -149,22 +309,58 @@ NEC PA-WL/54AG	AR5212	CardBus	a/b/g
 Netgear WAG311	AR5212	PCI	a/b/g
 Netgear WAB501	AR5211	CardBus	a/b
 Netgear WAG511	AR5212	CardBus	a/b/g
-Netgear WG311	AR5212	PCI	b/g
+Netgear WG311 rev1	AR5212	PCI	b/g
 Netgear WG511T	AR5212	CardBus	b/g
 Orinoco 8480	AR5212	CardBus	a/b/g
 Orinoco 8470WD	AR5212	CardBus	a/b/g
 Proxim Skyline 4030	AR5210	CardBus	a
 Proxim Skyline 4032	AR5210	PCI	a
 Samsung SWL-5200N	AR5212	CardBus	a/b/g
+Senao NL-5354MP	AR5212	PCI	a/b/g
 SMC SMC2735W	AR5210	CardBus	a
 Sony PCWA-C700	AR5212	CardBus	a/b
 Sony PCWA-C300S	AR5212	CardBus	b/g
 Sony PCWA-C500	AR5210	CardBus	a
-3Com 3CRPAG175	AR5212	CardBus	a/b/g
 .El
 .Pp
 An up to date list can be found at
 .Pa http://customerproducts.atheros.com/customerproducts .
+.Sh EXAMPLES
+The following
+.Xr hostname.if 5
+example configures ath0 to join whatever network is available on boot,
+using WEP key
+.Dq 0x1deadbeef1 ,
+channel 11, obtaining an IP address using DHCP:
+.Bd -literal -offset indent
+dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+.Ed
+.Pp
+The following
+.Xr hostname.if 5
+example creates a host-based access point on boot:
+.Bd -literal -offset indent
+inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
+	mediaopt hostap nwid my_net chan 11
+.Ed
+.Pp
+Configure ath0 for WEP, using hex key
+.Dq 0x1deadbeef1 :
+.Bd -literal -offset indent
+# ifconfig ath0 nwkey 0x1deadbeef1
+.Ed
+.Pp
+Return ath0 to its default settings:
+.Bd -literal -offset indent
+# ifconfig ath0 -bssid -chan media autoselect -mediaopt \e
+	nwid "" -nwkey -powersave
+.Ed
+.Pp
+Join an existing BSS network,
+.Dq my_net :
+.Bd -literal -offset indent
+# ifconfig ath0 192.168.1.1 netmask 0xffffff00 nwid my_net
+.Ed
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "ath%d: unable to attach hardware; HAL status %u"
@@ -184,8 +380,6 @@ This should not happen.
 The request to the HAL to set up the transmit queue for 802.11 beacon frames
 failed.
 This should not happen.
-.It "ath%d: 802.11 address: %s"
-The MAC address programmed in the EEPROM is displayed.
 .It "ath%d: hardware error; resetting"
 An unrecoverable error in the hardware occurred.
 Errors of this sort include unrecoverable DMA errors.
@@ -224,13 +418,6 @@ the set of available channels.
 A problem occurred while querying the HAL to find the set of available
 channels for the device.
 This should not happen.
-.It "ath%d: %s: %dM -\*[Gt] %dM (%d ok, %d err, %d retr)"
-The driver's rate control algorithm changed the current rate for transmitting
-frames.
-This message is temporarily enabled for normal use to help in diagnosing
-and improving the rate control algorithm.
-The message indicates the new and old transmit rates and the statistics
-it used to decide on this change.
 .It "ath%d: failed to enable memory mapping"
 The driver was unable to enable memory-mapped I/O to the PCI device registers.
 This should not happen.
@@ -252,9 +439,20 @@ This should not happen.
 .Xr cardbus 4 ,
 .Xr gpio 4 ,
 .Xr ifmedia 4 ,
+.Xt intro 4 ,
 .Xr netintro 4 ,
 .Xr pci 4 ,
+.Xr hostname.if 5 ,
 .Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 5.2
+using a binary-only HAL module which was ported to
+.Nx 2.0 .
+The driver using a free HAL-replacement first appeared in
+.Ox 3.7 .
 .Sh AUTHORS
 The
 .Nm
@@ -263,13 +461,9 @@ driver was written by
 and was ported to
 .Ox
 by
-.An Reyk Floeter .
+.An Reyk Floeter Aq reyk@openbsd.org
+who also wrote a free replacement of the binary-only HAL.
 .Sh CAVEATS
-Different regulatory domains have different default channels for adhoc
-mode.
-See
-.Xr ifconfig 8
-for information on how to change the channel.
 Different regulatory domains may not be able to communicate with each
 other with 802.11a as different regulatory domains do not necessarily
 have overlapping channels.
@@ -282,7 +476,7 @@ The algorithm used to select the rate for transmitted packets is
 very simplistic.
 There is no software retransmit; only hardware retransmit is used.
 Contributors are encouraged to replace the existing rate control algorithm
-with a better one (hint: all the information needed is available to the driver).
+with a better one.
 .Pp
 The driver does not fully enable power-save operation of the chip;
 consequently power use is suboptimal.
diff --git a/share/man/man4/atu.4 b/share/man/man4/atu.4
index 362fcc2fcce..9f028072320 100644
--- a/share/man/man4/atu.4
+++ b/share/man/man4/atu.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: atu.4,v 1.17 2005/03/03 11:51:37 dlg Exp $
+.\" $OpenBSD: atu.4,v 1.18 2005/03/06 21:49:00 jmc Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\" Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -35,7 +35,7 @@
 .Os
 .Sh NAME
 .Nm atu
-.Nd Atmel AT76C50x 802.11b wireless network interfaces
+.Nd Atmel AT76C50x IEEE 802.11b wireless network driver
 .Sh SYNOPSIS
 .Cd "# all architectures"
 .Cd "atu* at uhub? port ?"
@@ -46,66 +46,43 @@ driver provides support for wireless network adapters based around
 the Atmel AT76C503, AT76C503A, AT76C505, and AT76C505A USB chipsets and four
 companion radio chipsets.
 .Pp
-The hardware supports features including 802.11 and 802.3 frames,
-Wired Equivalent Privacy (WEP), power management,
-selectable transmission rates, and both BSS and IBSS modes of operation.
-.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.
+driver encapsulates all IP and ARP traffic as 802.11 frames,
+though it can receive either 802.11 or 802.3 frames.
 .Pp
-The
+These are the modes the
 .Nm
-driver supports Basic Service Set (BSS) operation
-(also known as infrastructure mode).
-This mode requires the use of an access point (also known as a base station)
-to support communication between the adapter and the network.
+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 IBSS mode
+Also known as
+.Em IEEE ad-hoc
+mode or
+.Em peer-to-peer
+mode.
+This is the standardized method of operating without an access point.
+Stations associate with a service set.
+However, actual connections between stations are peer-to-peer.
+.El
 .Pp
-The
 .Nm
-driver also supports Independent Basic Service Set (IBSS)
-operation (also known as ad-hoc or point-to-point mode).
-In IBSS mode stations can communicate amongst themselves without the aid of
-an access point.
-Note there are two different modes described as ad-hoc:
-ad-hoc demo mode, which predates IEEE, is not standardised and does not
-allow interoperability with cards from other vendors; and IBSS,
-which is IEEE standardised and permits interoperability.
-The
-.Nm
-driver supports IEEE standardised IBSS operation.
-.Pp
+supports hardware 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 128-bit encryption.
+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.
-.Pp
-The following devices are known to be supported by the
-.Nm
-driver:
-.Pp
-.Bl -tag -width Ds -offset indent -compact
-.It Tn Acer Peripherals AWL300
-.It Tn Acer Peripherals AWL400
-.It Tn Aincomm AWU2000B
-.It Tn Bluetake BW002
-.It Tn D-Link DWL-120
-.It Tn Geowave GW-US11S
-.It Tn Linksys WUSB11
-.It Tn Linksys WUSB11-V28
-.It Tn Netgear MA101 rev B
-.It Tn Ovislink AirLive WL-1120USB
-.It Tn OvisLink AirLive WL-1130USB
-.It Tn SMC 2662W-AR
-.It Tn SMC 2662W-V4
-.It Tn WiFi interface on OQO model 01
-.El
-.Pp
+.Sh CONFIGURATION
 The
 .Nm
 driver can be configured at runtime with
@@ -121,11 +98,11 @@ Unset the desired BSSID.
 The interface will automatically select a BSSID in this mode, which is
 the default.
 .It Cm chan Ar n
-Set the channel (radio frequency) to be used by the adapter based on
+Set the channel (radio frequency) to be used by the driver based on
 the given channel ID
 .Ar n .
 .It Fl chan
-Unset the desired channel to be used by the adapter.
+Unset the desired channel to be used by the driver.
 The driver will automatically select a channel in this mode, which is
 the default.
 .It Cm media Ar media
@@ -139,13 +116,13 @@ types:
 .It Cm autoselect
 Enable autoselection of the media type and options.
 .It Cm DS1
-Set Direct Spread 1Mbps operation.
+Set 802.11b DS 1Mbps operation.
 .It Cm DS2
-Set Direct Spread 2Mbps operation.
+Set 802.11b DS 2Mbps operation.
 .It Cm DS5
-Set Direct Spread 5.5Mbps operation.
+Set 802.11b DS 5.5Mbps operation.
 .It Cm DS11
-Set Direct Spread 11Mbps operation.
+Set 802.11b DS 11Mbps operation.
 .El
 .It Cm mediaopt Ar opts
 The
@@ -156,16 +133,8 @@ driver supports the following media options:
 Select Independent Basic Service Set (IBSS) operation.
 .El
 .It Fl mediaopt Ar opts
-Disable the specified media options on the adapter and returns it to the
+Disable the specified media options on the driver and returns it to the
 default mode of operation (BSS).
-.It Cm mode Ar mode
-The
-.Nm
-driver supports the following modes:
-.Bl -tag -width 11b
-.It Cm 11b
-Force 802.11b operation.
-.El
 .It Cm nwid Ar id
 Set the network ID.
 The
@@ -207,6 +176,27 @@ or 104-bit (13 characters or 26 hexadecimal digits) keys.
 Disable WEP encryption.
 This is the default mode of operation.
 .El
+.Sh HARDWARE
+The following devices are known to be supported by the
+.Nm
+driver:
+.Pp
+.Bl -tag -width Ds -offset indent -compact
+.It Tn Acer Peripherals AWL300
+.It Tn Acer Peripherals AWL400
+.It Tn Aincomm AWU2000B
+.It Tn Bluetake BW002
+.It Tn D-Link DWL-120
+.It Tn Geowave GW-US11S
+.It Tn Linksys WUSB11
+.It Tn Linksys WUSB11-V28
+.It Tn Netgear MA101 rev B
+.It Tn OQO model 01 WiFi
+.It Tn Ovislink AirLive WL-1120USB
+.It Tn OvisLink AirLive WL-1130USB
+.It Tn SMC 2662W-AR
+.It Tn SMC 2662W-V4
+.El
 .Sh FILES
 The adapter needs some firmware files, which are loaded on demand by the
 driver when the device is attached:
@@ -221,6 +211,34 @@ driver when the device is attached:
 .It Pa /etc/firmware/atu-rfmd2958smc-int
 .It Pa /etc/firmware/atu-rfmd2958smc-ext
 .El
+.Sh EXAMPLES
+The following
+.Xr hostname.if 5
+example configures atu0 to join whatever network is available on boot,
+using WEP key
+.Dq 0x1deadbeef1 ,
+channel 11, obtaining an IP address using DHCP:
+.Bd -literal -offset indent
+dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+.Ed
+.Pp
+Configure atu0 for WEP, using hex key
+.Dq 0x1deadbeef1 :
+.Bd -literal -offset indent
+# ifconfig atu0 nwkey 0x1deadbeef1
+.Ed
+.Pp
+Return atu0 to its default settings:
+.Bd -literal -offset indent
+# ifconfig atu0 -bssid -chan media autoselect -mediaopt \e
+	nwid "" -nwkey
+.Ed
+.Pp
+Join an existing BSS network,
+.Dq my_net :
+.Bd -literal -offset indent
+# ifconfig atu0 192.168.0.2 netmask 0xffffff00 nwid my_net
+.Ed
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr ifmedia 4 ,
diff --git a/share/man/man4/atw.4 b/share/man/man4/atw.4
index 9aa75745ac3..fe57442e3e1 100644
--- a/share/man/man4/atw.4
+++ b/share/man/man4/atw.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: atw.4,v 1.11 2004/11/08 23:05:42 deraadt Exp $
+.\"     $OpenBSD: atw.4,v 1.12 2005/03/06 21:49:00 jmc Exp $
 .\"	$NetBSD: atw.4,v 1.8 2004/06/06 04:05:49 wiz Exp $
 .\"
 .\" Copyright (c) 2003
@@ -33,7 +33,7 @@
 .Os
 .Sh NAME
 .Nm atw
-.Nd ADMtek ADM8211 802.11B wireless network interface
+.Nd ADMtek ADM8211 IEEE 802.11b wireless network driver
 .Sh SYNOPSIS
 .Cd "atw* at cardbus?"
 .Cd "atw* at pci?"
@@ -45,9 +45,9 @@ ADMtek ADM8211.
 .Pp
 The ADM8211 is a bus-mastering 802.11 Media Access Controller (MAC)
 which is derived from ADMtek's DEC/Intel 21143 clones (see
-.Xr dc 4 ) .
-It supports contention-free traffic (with an 802.11 Point Coordinator),
-64/128-bit WEP encryption, and 802.11 power-saving.
+.Xr dc 4
+for more information).
+It supports contention-free traffic (with an 802.11 Point Coordinator).
 The ADM8211 integrates an RF3000 baseband processor (BBP) by RF
 Microdevices.
 .Pp
@@ -68,31 +68,141 @@ association, and authentication.
 The host is also responsible for programming both the BBP and the
 RF/IF synthesizer.
 .Pp
+These are the modes the
 .Nm
-contains incomplete support for the ADM8211's WEP encryption/decryption
-engine.
+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 IBSS mode
+Also known as
+.Em IEEE ad-hoc
+mode or
+.Em peer-to-peer
+mode.
+This is the standardized method of operating without an access point.
+Stations associate with a service set.
+However, actual connections between stations are peer-to-peer.
+.El
+.Pp
 .Nm
-does not yet support hardware WEP decryption, however, it will use
-the ADM8211's crypto engine to encrypt transmitted frames.
-Documentation from ADMtek claims that, in addition to the 4 128-bit
-shared WEP keys, the ADM8211 will store WEP key pairs for up to 20
-peers.
-The documentation provides no details, hence
+supports hardware WEP (though see
+.Sx CAVEATS
+below).
+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.
+.Sh CONFIGURATION
+The
 .Nm
-does not support the 20 key-pairs.
+driver can be configured at runtime with
+.Xr ifconfig 8
+or on boot with
+.Xr hostname.if 5
+using the following parameters:
+.Bl -tag -width Ds
+.It Cm bssid Ar bssid
+Set the desired BSSID.
+.It Fl bssid
+Unset the desired BSSID.
+The interface will automatically select a BSSID in this mode, which is
+the default.
+.It Cm chan Ar n
+Set the channel (radio frequency) to be used by the driver based on
+the given channel ID
+.Ar n .
+.It Fl chan
+Unset the desired channel to be used by the driver.
+The driver will automatically select a channel in this mode, which is
+the default.
+.It Cm media Ar media
+The
+.Nm
+driver supports the following
+.Ar media
+types:
 .Pp
-The ADM8211 operates in 802.11 infrastructure mode (with an access
-point) and in 802.11 ad hoc mode (without an access point) at 1,
-2, 5.5, and 11Mbps.
-ADMtek says that the ADM8211 cannot operate as an access point.
+.Bl -tag -width autoselect -compact
+.It Cm autoselect
+Enable autoselection of the media type and options.
+.It Cm DS1
+Set 802.11b DS 1Mbps operation.
+.It Cm DS2
+Set 802.11b DS 2Mbps operation.
+.It Cm DS5
+Set 802.11b DS 5.5Mbps operation.
+.It Cm DS11
+Set 802.11b DS 11Mbps operation.
+.El
+.It Cm mediaopt Ar opts
+The
+.Nm
+driver supports the following media options:
 .Pp
-The operating mode is selected using the
-.Xr ifconfig 8
-utility.
-For more information on configuring this device, see
-.Xr ifconfig 8
-and
-.Xr ifmedia 4 .
+.Bl -tag -width monitor -compact
+.It Cm ibss
+Select IBSS operation.
+.El
+.It Fl mediaopt Ar opts
+Disable the specified media options on the driver and returns it to the
+default mode of operation (BSS).
+.It Cm nwid Ar id
+Set the network ID.
+The
+.Ar id
+can either be any text string up to 32 characters in length,
+or a series of hexadecimal digits up to 64 digits.
+An empty
+.Ar id
+string allows the interface to connect to any available access points.
+By default the
+.Nm
+driver uses an empty string.
+.It Cm nwkey Ar key
+Enable WEP encryption using the specified
+.Ar key .
+The
+.Ar key
+can either be a string, a series of hexadecimal digits (preceded by
+.Sq 0x ) ,
+or a set of keys of the form
+.Dq n:k1,k2,k3,k4 ,
+where
+.Sq n
+specifies which of the keys will be used for transmitted packets,
+and the four keys,
+.Dq k1
+through
+.Dq k4 ,
+are configured as WEP keys.
+If a set of keys is specified, a comma
+.Pq Sq \&,
+within the key must be escaped with a backslash.
+Note that if multiple keys are used, their order must be the same within
+the network.
+.Nm
+is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
+or 104-bit (13 characters or 26 hexadecimal digits) keys.
+.It Fl nwkey
+Disable WEP encryption.
+This is the default mode of operation.
+.It Cm nwkey persist
+Enable WEP encryption with the persistent key stored in the network card.
+.It Cm nwkey persist : Ns Ar key
+Write
+.Ar key
+to the persistent memory of the network card,
+and enable WEP encryption using that key.
+.El
 .Sh HARDWARE
 The
 .Nm
@@ -100,24 +210,15 @@ driver supports PCI and Cardbus cards using revision 0x11 and 0x15
 of the ADM8211 (aka ADM8211A).
 This includes:
 .Pp
-.Bl -item -offset indent -compact
-.It
-3Com OfficeConnect 3CRSHPW796 Cardbus card
-.It
-Belkin F5D6001 PCI card (version 2 only)
-.It
-Blitz NetWave Point Cardbus card
-.It
-D-Link DWL-650 Rev. L1 Cardbus card
-.It
-D-Link DWL-520 Rev. C1 PCI card
-.It
-LanReady WP2000 PCI card
-.It
-TrendNet TEW-221PC Cardbus card
-.It
-Xterasys XN2511B PCI card
-.It
+.Bl -tag -width Ds -offset indent -compact
+.It 3Com OfficeConnect 3CRSHPW796 Cardbus
+.It Belkin F5D6001 PCI (version 2 only)
+.It Blitz NetWave Point Cardbus
+.It D-Link DWL-650 Rev. \&L1 Cardbus
+.It D-Link DWL-520 Rev. \&C1 PCI
+.It LanReady WP2000 PCI
+.It TrendNet TEW-221PC Cardbus
+.It Xterasys XN2511B PCI
 .El
 .Pp
 The
@@ -126,10 +227,37 @@ driver does not yet support cards using revision 0x20 (ADM8211B) or
 0x30 (ADM8211C).
 This includes:
 .Pp
-.Bl -item -offset indent -compact
-.It
-SMC 2635W Cardbus card
+.Bl -tag -width Ds -offset indent -compact
+.It SMC 2635W Cardbus
 .El
+.Sh EXAMPLES
+The following
+.Xr hostname.if 5
+example configures atw0 to join whatever network is available on boot,
+using WEP key
+.Dq 0x1deadbeef1 ,
+channel 11, obtaining an IP address using DHCP:
+.Bd -literal -offset indent
+dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+.Ed
+.Pp
+Configure atw0 for WEP, using hex key
+.Dq 0x1deadbeef1 :
+.Bd -literal -offset indent
+# ifconfig atw0 nwkey 0x1deadbeef1
+.Ed
+.Pp
+Return atw0 to its default settings:
+.Bd -literal -offset indent
+# ifconfig atw0 -bssid -chan media autoselect -mediaopt \e
+	nwid "" -nwkey
+.Ed
+.Pp
+Join an existing BSS network,
+.Dq my_net :
+.Bd -literal -offset indent
+# ifconfig atw0 192.168.1.1 netmask 0xffffff00 nwid my_net
+.Ed
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "atw0: failed to tune channel %d"
@@ -147,8 +275,10 @@ command.
 .Xr arp 4 ,
 .Xr cardbus 4 ,
 .Xr ifmedia 4 ,
+.Xr intro 4 ,
 .Xr netintro 4 ,
 .Xr pci 4 ,
+.Xr hostname.if 5 ,
 .Xr ifconfig 8
 .Rs
 .%T ADMtek
@@ -183,8 +313,8 @@ tlp driver by
 The author does not fully understand what processing the duration
 fields for the PLCP header and the 802.11 header undergo before
 they are applied to a transmitted frame.
-If the duration fields in transmitted frames are incorrect, the
-performance of your network may suffer.
+If the duration fields in transmitted frames are incorrect,
+network performance may suffer.
 .Pp
 The driver does not provide rate control when the media type is
 set to autoselect.
@@ -199,19 +329,32 @@ The author is investigating.
 Many features are still missing, especially WEP decryption and
 802.11 power-saving.
 .Pp
-The ad hoc mode has not been rigorously tested.
+The ad-hoc mode has not been rigorously tested.
 IBSSs with the same SSID may not coalesce, but this should not
 matter for most applications.
 .Pp
 The driver is untested in the ad-hoc demo mode of Lucent WaveLAN
 cards.
 .Pp
-The ADM8211 supports 802.11 power-saving, however,
+The ADM8211 supports 802.11 power-saving; however,
 .Nm
 does not support it yet.
 For time-bounded service, the ADM8211 will interoperate with an
-access point which implements the 802.11 Point Coordination Function,
+access point which implements the 802.11 Point Coordination Function;
 however, this is also not supported.
 .Pp
 Combinations of an ADM8211 with either an Intersil or a Marvell RF
 front-end are not supported.
+.Pp
+.Nm
+contains incomplete support for the ADM8211's WEP encryption/decryption
+engine.
+.Nm
+does not yet support hardware WEP decryption; however, it will use
+the ADM8211's crypto engine to encrypt transmitted frames.
+Documentation from ADMtek claims that, in addition to the 4 104-bit
+shared WEP keys, the ADM8211 will store WEP key pairs for up to 20
+peers.
+The documentation provides no details, hence
+.Nm
+does not support the 20 key-pairs.
diff --git a/share/man/man4/awi.4 b/share/man/man4/awi.4
index 609f5b33774..c7f1891c3fb 100644
--- a/share/man/man4/awi.4
+++ b/share/man/man4/awi.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: awi.4,v 1.18 2004/11/08 20:16:02 jmc Exp $
+.\"	$OpenBSD: awi.4,v 1.19 2005/03/06 21:49:00 jmc Exp $
 .\"     $NetBSD: awi.4,v 1.1 1999/11/04 19:36:01 sommerfeld Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -48,19 +48,6 @@ The
 .Nm
 driver provides support for wireless adapters based upon the AMD 802.11
 PCnet Mobile firmware.
-This includes the following adapters:
-.Pp
-.Bl -tag -width Ds -offset indent -compact
-.It Bay Networks BayStack 650
-.It Bay Networks BayStack 660
-.It Bay Network AirSurfer Pro
-.It AMD Am79C930
-.It Icom SL-200
-.It Nokia C020
-.It Farallon Communications SkyLINE Wireless
-.It Zoom Air-4000
-.El
-.Pp
 The PCnet Mobile design is based on an AMD 79c930 controller, which provides
 access to 32kb of memory shared between the controller and the host.
 All host/device interaction is via this shared memory, which can be
@@ -70,10 +57,6 @@ The
 driver encapsulates all IP and ARP traffic as 802.11 frames.
 Transmit speed is fixed at 1Mbps.
 .Pp
-The driver currently only works in infrastructure mode, communicating
-with an Access Point which serves as a link-layer bridge between an
-Ethernet and the wireless network.
-.Pp
 This card seems to take between 5 and 20 seconds after it has been brought up
 to synchronize with an AP.
 When using
@@ -82,6 +65,99 @@ to automatically configure an address on this card, it may be
 advisable to delay the invocation of dhclient for about 10 seconds
 after the card is brought up using
 .Xr ifconfig 8 .
+.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 is the only mode available for this card.
+.El
+.Sh CONFIGURATION
+The
+.Nm
+driver can be configured at runtime with
+.Xr ifconfig 8
+or on boot with
+.Xr hostname.if 5
+using the following parameters:
+.Bl -tag -width Ds
+.It Cm bssid Ar bssid
+Set the desired BSSID.
+.It Fl bssid
+Unset the desired BSSID.
+The interface will automatically select a BSSID in this mode, which is
+the default.
+.It Cm chan Ar n
+Set the channel (radio frequency) to be used by the driver based on
+the given channel ID
+.Ar n .
+.It Fl chan
+Unset the desired channel to be used by the driver.
+The driver will automatically select a channel in this mode, which is
+the default.
+.It Cm media Ar media
+The
+.Nm
+driver supports the following
+.Ar media
+types:
+.Pp
+.Bl -tag -width autoselect -compact
+.It Cm autoselect
+Enable autoselection of the media type and options.
+.It Cm FH1
+Set legacy 802.11 FH 1Mbps operation.
+.El
+.It Cm nwid Ar id
+Set the network ID.
+The
+.Ar id
+can either be any text string up to 32 characters in length,
+or a series of hexadecimal digits up to 64 digits.
+An empty
+.Ar id
+string allows the interface to connect to any available access points.
+By default the
+.Nm
+driver uses an empty string.
+.El
+.Sh HARDWARE
+The following adapters are known to be supported:
+.Pp
+.Bl -tag -width Ds -offset indent -compact
+.It AMD Am79C930
+.It Bay Networks BayStack 650
+.It Bay Networks BayStack 660
+.It Bay Network AirSurfer Pro
+.It Farallon Communications SkyLINE Wireless
+.It Icom SL-200
+.It Nokia C020
+.It Zoom Air-4000
+.El
+.Sh EXAMPLES
+The following
+.Xr hostname.if 5
+example configures awi0 to join whatever network is available on boot,
+using channel 11, obtaining an IP address using DHCP:
+.Bd -literal -offset indent
+dhcp NONE NONE NONE chan 11
+.Ed
+.Pp
+Return awi0 to its default settings:
+.Bd -literal -offset indent
+# ifconfig awi0 -bssid -chan media autoselect nwid ""
+.Ed
+.Pp
+Join an existing BSS network,
+.Dq my_net :
+.Bd -literal -offset indent
+# ifconfig awi0 192.168.1.1 netmask 0xffffff00 nwid my_net
+.Ed
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "awi0: unable to allocate memory space; using i/o only"
@@ -145,7 +221,7 @@ driver was written by
 and ported to
 .Ox
 by
-.An Angelos D. Keromytis Aq angelos@dsl.cis.upenn.edu
+.An Angelos D. Keromytis Aq angelos@dsl.cis.upenn.edu .
 .Sh BUGS
 Doesn't support ad-hoc mode or WEP.
 Round trip times seem higher than what one might expect.
diff --git a/share/man/man4/ipw.4 b/share/man/man4/ipw.4
index b35c7d7dd46..720ab8ba676 100644
--- a/share/man/man4/ipw.4
+++ b/share/man/man4/ipw.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipw.4,v 1.10 2005/02/21 13:33:25 damien Exp $
+.\" $OpenBSD: ipw.4,v 1.11 2005/03/06 21:49:00 jmc Exp $
 .\"
 .\" Copyright (c) 2004
 .\"	Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
@@ -30,9 +30,7 @@
 .Dt IPW 4
 .Sh NAME
 .Nm ipw
-.Nd
-.Tn Intel
-PRO/Wireless 2100 IEEE 802.11B wireless network adapter
+.Nd Intel PRO/Wireless 2100 IEEE 802.11b wireless network driver
 .Sh SYNOPSIS
 .Cd "ipw* at pci?"
 .Sh DESCRIPTION
@@ -43,13 +41,121 @@ driver provides support for the
 PRO/Wireless 2100 MiniPCI network
 adapter.
 .Pp
-By default, the
+These are the modes the
 .Nm
-driver configures the adapter for BSS operation (aka infrastructure mode).
-This mode requires the use of an access point.
+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 IBSS mode
+Also known as
+.Em IEEE ad-hoc
+mode or
+.Em peer-to-peer
+mode.
+This is the standardized method of operating without an access point.
+Stations associate with a service set.
+However, actual connections between stations are peer-to-peer.
+.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
-For more information on configuring this device, see
-.Xr ifconfig 8 .
+.Nm
+supports hardware 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.
+.Sh CONFIGURATION
+The
+.Nm
+driver can be configured at runtime with
+.Xr ifconfig 8
+or on boot with
+.Xr hostname.if 5
+using the following parameters:
+.Bl -tag -width Ds
+.It Cm bssid Ar bssid
+Set the desired BSSID.
+.It Fl bssid
+Unset the desired BSSID.
+The interface will automatically select a BSSID in this mode, which is
+the default.
+.It Cm chan Ar n
+Set the channel (radio frequency) to be used by the driver based on
+the given channel ID
+.Ar n .
+.It Fl chan
+Unset the desired channel to be used by the driver.
+The driver will automatically select a channel in this mode, which is
+the default.
+.It Cm mediaopt Ar opts
+The
+.Nm
+driver supports the following media options:
+.Pp
+.Bl -tag -width monitor -compact
+.It Cm ibss
+Select IBSS operation.
+.It Cm monitor
+Select monitor mode.
+.El
+.It Fl mediaopt Ar opts
+Disable the specified media options on the driver and returns it to the
+default mode of operation (BSS).
+.It Cm nwid Ar id
+Set the network ID.
+The
+.Ar id
+can either be any text string up to 32 characters in length,
+or a series of hexadecimal digits up to 64 digits.
+An empty
+.Ar id
+string allows the interface to connect to any available access points.
+By default the
+.Nm
+driver uses an empty string.
+.It Cm nwkey Ar key
+Enable WEP encryption using the specified
+.Ar key .
+The
+.Ar key
+can either be a string, a series of hexadecimal digits (preceded by
+.Sq 0x ) ,
+or a set of keys of the form
+.Dq n:k1,k2,k3,k4 ,
+where
+.Sq n
+specifies which of the keys will be used for transmitted packets,
+and the four keys,
+.Dq k1
+through
+.Dq k4 ,
+are configured as WEP keys.
+If a set of keys is specified, a comma
+.Pq Sq \&,
+within the key must be escaped with a backslash.
+Note that if multiple keys are used, their order must be the same within
+the network.
+.Nm
+is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
+or 104-bit (13 characters or 26 hexadecimal digits) keys.
+.It Fl nwkey
+Disable WEP encryption.
+This is the default mode of operation.
+.El
 .Sh FILES
 The driver needs some firmware files,
 which are loaded on demand when the device is attached:
@@ -70,25 +176,32 @@ users have to find these files on their own.
 The official person to state your views to about this issue is
 peter.engelbrecht@intel.com at (858) 391 1857.
 .Sh EXAMPLES
-Join an existing BSS network (ie: connect to an access point):
-.Pp
-.Dl "# ifconfig ipw0 inet 192.168.0.20 netmask 0xffffff00"
-.Pp
-Join a specific BSS network with network name
-.Dq Li my_net :
+The following
+.Xr hostname.if 5
+example configures ipw0 to join whatever network is available on boot,
+using WEP key
+.Dq 0x1deadbeef1 ,
+channel 11, obtaining an IP address using DHCP:
+.Bd -literal -offset indent
+dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+.Ed
 .Pp
-.Dl "# ifconfig ipw0 inet 192.168.0.20 netmask 0xffffff00 nwid my_net"
+Configure ipw0 for WEP, using hex key
+.Dq 0x1deadbeef1 :
+.Bd -literal -offset indent
+# ifconfig ipw0 nwkey 0x1deadbeef1
+.Ed
 .Pp
-Join a specific BSS network with 64 bits WEP encryption:
+Return ipw0 to its default settings:
 .Bd -literal -offset indent
-# ifconfig ipw0 inet 192.168.0.20 netmask 0xffffff00 nwid my_net \e
-        nwkey 0x1234567890
+# ifconfig ipw0 -bssid -chan media autoselect -mediaopt \e
+	nwid "" -nwkey
 .Ed
 .Pp
-Join a specific BSS network with 128bits WEP encryption:
+Join an existing BSS network,
+.Dq my_net :
 .Bd -literal -offset indent
-# ifconfig ipw0 inet 192.168.0.20 netmask 0xffffff00 nwid my_net \e
-        nwkey 0x01020304050607080910111213
+# ifconfig ipw0 192.168.1.1 netmask 0xffffff00 nwid my_net
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/iwi.4 b/share/man/man4/iwi.4
index a82c47b2a83..beb2ca03bb3 100644
--- a/share/man/man4/iwi.4
+++ b/share/man/man4/iwi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwi.4,v 1.12 2005/02/21 13:33:25 damien Exp $
+.\" $OpenBSD: iwi.4,v 1.13 2005/03/06 21:49:00 jmc Exp $
 .\"
 .\" Copyright (c) 2004
 .\"	Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
@@ -30,9 +30,7 @@
 .Dt IWI 4
 .Sh NAME
 .Nm iwi
-.Nd
-.Tn Intel
-PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11A/B/G wireless network adapters
+.Nd Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11a/b/g wireless network driver
 .Sh SYNOPSIS
 .Cd "iwi* at pci?"
 .Sh DESCRIPTION
@@ -42,13 +40,105 @@ driver provides support for
 .Tn Intel
 PRO/Wireless 2200BG/2915ABG MiniPCI and 2225BG PCI network adapters.
 .Pp
-By default, the
+These are the modes the
 .Nm
-driver configures the adapter for BSS operation (aka infrastructure mode).
-This mode requires the use of an access point.
+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 is the only mode available for this card.
+.El
 .Pp
-For more information on configuring this device, see
-.Xr ifconfig 8 .
+.Nm
+supports hardware 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.
+.Sh CONFIGURATION
+The
+.Nm
+driver can be configured at runtime with
+.Xr ifconfig 8
+or on boot with
+.Xr hostname.if 5
+using the following parameters:
+.Bl -tag -width Ds
+.It Cm bssid Ar bssid
+Set the desired BSSID.
+.It Fl bssid
+Unset the desired BSSID.
+The interface will automatically select a BSSID in this mode, which is
+the default.
+.It Cm chan Ar n
+Set the channel (radio frequency) to be used by the driver based on
+the given channel ID
+.Ar n .
+.It Fl chan
+Unset the desired channel to be used by the driver.
+The driver will automatically select a channel in this mode, which is
+the default.
+.It Cm mode Ar mode
+The
+.Nm
+driver supports the following modes:
+.Pp
+.Bl -tag -width 11b -compact
+.It Cm 11a
+Force 802.11a operation.
+.It Cm 11b
+Force 802.11b operation.
+.It Cm 11g
+Force 802.11g operation.
+.El
+.It Cm nwid Ar id
+Set the network ID.
+The
+.Ar id
+can either be any text string up to 32 characters in length,
+or a series of hexadecimal digits up to 64 digits.
+An empty
+.Ar id
+string allows the interface to connect to any available access points.
+By default the
+.Nm
+driver uses an empty string.
+.It Cm nwkey Ar key
+Enable WEP encryption using the specified
+.Ar key .
+The
+.Ar key
+can either be a string, a series of hexadecimal digits (preceded by
+.Sq 0x ) ,
+or a set of keys of the form
+.Dq n:k1,k2,k3,k4 ,
+where
+.Sq n
+specifies which of the keys will be used for transmitted packets,
+and the four keys,
+.Dq k1
+through
+.Dq k4 ,
+are configured as WEP keys.
+If a set of keys is specified, a comma
+.Pq Sq \&,
+within the key must be escaped with a backslash.
+Note that if multiple keys are used, their order must be the same within
+the network.
+.Nm
+is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
+or 104-bit (13 characters or 26 hexadecimal digits) keys.
+.It Fl nwkey
+Disable WEP encryption.
+This is the default mode of operation.
+.El
 .Sh FILES
 The driver needs some firmware files,
 which are loaded on demand when the device is attached:
@@ -70,25 +160,31 @@ users have to find these files on their own.
 The official person to state your views to about this issue is
 peter.engelbrecht@intel.com at (858) 391 1857.
 .Sh EXAMPLES
-Join an existing BSS network (ie: connect to an access point):
-.Pp
-.Dl "# ifconfig iwi0 inet 192.168.0.20 netmask 0xffffff00"
-.Pp
-Join a specific BSS network with network name
-.Dq Li my_net :
+The following
+.Xr hostname.if 5
+example configures iwi0 to join whatever network is available on boot,
+using WEP key
+.Dq 0x1deadbeef1 ,
+channel 11, obtaining an IP address using DHCP:
+.Bd -literal -offset indent
+dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+.Ed
 .Pp
-.Dl "# ifconfig iwi0 inet 192.168.0.20 netmask 0xffffff00 nwid my_net"
+Configure iwi0 for WEP, using hex key
+.Dq 0x1deadbeef1 :
+.Bd -literal -offset indent
+# ifconfig iwi0 nwkey 0x1deadbeef1
+.Ed
 .Pp
-Join a specific BSS network with 64 bits WEP encryption:
+Return iwi0 to its default settings:
 .Bd -literal -offset indent
-# ifconfig iwi0 inet 192.168.0.20 netmask 0xffffff00 nwid my_net \e
-        nwkey 0x1234567890
+# ifconfig iwi0 -bssid -chan nwid "" -nwkey
 .Ed
 .Pp
-Join a specific BSS network with 128bits WEP encryption:
+Join an existing BSS network,
+.Dq my_net :
 .Bd -literal -offset indent
-# ifconfig iwi0 inet 192.168.0.20 netmask 0xffffff00 nwid my_net \e
-        nwkey 0x01020304050607080910111213
+# ifconfig iwi0 192.168.1.1 netmask 0xffffff00 nwid my_net
 .Ed
 .Sh DIAGNOSTICS
 .Bl -diag
diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4
index 3d8b9246b5b..bec5ead5bdf 100644
--- a/share/man/man4/ral.4
+++ b/share/man/man4/ral.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ral.4,v 1.4 2005/02/24 13:40:50 jsg Exp $
+.\" $OpenBSD: ral.4,v 1.5 2005/03/06 21:49:00 jmc Exp $
 .\"
 .\" Copyright (c) 2005
 .\"	Damien Bergamini <damien.bergamini@free.fr>
@@ -20,7 +20,7 @@
 .Dt RAL 4
 .Sh NAME
 .Nm ral
-.Nd Ralink Technology RT2500 IEEE 802.11A/B/G wireless network adapter
+.Nd Ralink Technology RT2500 IEEE 802.11b/g wireless network driver
 .Sh SYNOPSIS
 .Cd "ral* at cardbus?"
 .Cd "ral* at pci?"
@@ -29,7 +29,170 @@ The
 .Nm
 driver supports PCI/Cardbus wireless adapters based on the Ralink RT2500
 chipset.
-This includes:
+.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 IBSS mode
+Also known as
+.Em IEEE ad-hoc
+mode or
+.Em peer-to-peer
+mode.
+This is the standardized method of operating without an access point.
+Stations associate with a service set.
+However, actual connections between stations are peer-to-peer.
+.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 hardware 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.
+.Sh CONFIGURATION
+The
+.Nm
+driver can be configured at runtime with
+.Xr ifconfig 8
+or on boot with
+.Xr hostname.if 5
+using the following parameters:
+.Bl -tag -width Ds
+.It Cm bssid Ar bssid
+Set the desired BSSID.
+.It Fl bssid
+Unset the desired BSSID.
+The interface will automatically select a BSSID in this mode, which is
+the default.
+.It Cm chan Ar n
+Set the channel (radio frequency) to be used by the driver based on
+the given channel ID
+.Ar n .
+.It Fl chan
+Unset the desired channel to be used by the driver.
+The driver will automatically select a channel in this mode, which is
+the default.
+.It Cm media Ar media
+The
+.Nm
+driver supports the following
+.Ar media
+types:
+.Pp
+.Bl -tag -width autoselect -compact
+.It Cm autoselect
+Enable autoselection of the media type and options.
+.It Cm DS1
+Set 802.11b DS 1Mbps operation.
+.It Cm DS2
+Set 802.11b DS 2Mbps operation.
+.It Cm DS5
+Set 802.11b DS 5.5Mbps operation.
+.It Cm DS11
+Set 802.11b DS 11Mbps operation.
+.It Cm OFDM6
+Set 802.11g OFDM 6Mbps operation.
+.It Cm OFDM9
+Set 802.11g OFDM 9Mbps operation.
+.It Cm OFDM12
+Set 802.11g OFDM 12Mbps operation.
+.It Cm OFDM18
+Set 802.11g OFDM 18Mbps operation.
+.It Cm OFDM24
+Set 802.11g OFDM 24Mbps operation.
+.It Cm OFDM36
+Set 802.11g OFDM 36Mbps operation.
+.It Cm OFDM48
+Set 802.11g OFDM 48Mbps operation.
+.It Cm OFDM54
+Set 802.11g OFDM 54Mbps operation.
+.El
+.It Cm mediaopt Ar opts
+The
+.Nm
+driver supports the following media options:
+.Pp
+.Bl -tag -width monitor -compact
+.It Cm ibss
+Select IBSS operation.
+.It Cm monitor
+Select monitor mode.
+.El
+.It Fl mediaopt Ar opts
+Disable the specified media options on the driver and returns it to the
+default mode of operation (BSS).
+.It Cm mode Ar mode
+The
+.Nm
+driver supports the following modes:
+.Pp
+.Bl -tag -width 11b -compact
+.It Cm 11b
+Force 802.11b operation.
+.It Cm 11g
+Force 802.11g operation.
+.El
+.It Cm nwid Ar id
+Set the network ID.
+The
+.Ar id
+can either be any text string up to 32 characters in length,
+or a series of hexadecimal digits up to 64 digits.
+An empty
+.Ar id
+string allows the interface to connect to any available access points.
+By default the
+.Nm
+driver uses an empty string.
+.It Cm nwkey Ar key
+Enable WEP encryption using the specified
+.Ar key .
+The
+.Ar key
+can either be a string, a series of hexadecimal digits (preceded by
+.Sq 0x ) ,
+or a set of keys of the form
+.Dq n:k1,k2,k3,k4 ,
+where
+.Sq n
+specifies which of the keys will be used for transmitted packets,
+and the four keys,
+.Dq k1
+through
+.Dq k4 ,
+are configured as WEP keys.
+If a set of keys is specified, a comma
+.Pq Sq \&,
+within the key must be escaped with a backslash.
+Note that if multiple keys are used, their order must be the same within
+the network.
+.Nm
+is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
+or 104-bit (13 characters or 26 hexadecimal digits) keys.
+.It Fl nwkey
+Disable WEP encryption.
+This is the default mode of operation.
+.El
+.Sh HARDWARE
+The following adapters are known to be supported:
 .Pp
 .Bl -tag -width Ds -offset indent -compact
 .It ASUS WL-130g PCI
@@ -37,14 +200,34 @@ This includes:
 .It MSI CB54G2 Cardbus
 .It Surecom EP-9428-g Cardbus
 .El
+.Sh EXAMPLES
+The following
+.Xr hostname.if 5
+example configures ral0 to join whatever network is available on boot,
+using WEP key
+.Dq 0x1deadbeef1 ,
+channel 11, obtaining an IP address using DHCP:
+.Bd -literal -offset indent
+dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+.Ed
 .Pp
-By default, the
-.Nm
-driver configures the adapter for BSS operation (aka infrastructure mode).
-This mode requires the use of an access point.
+Configure ral0 for WEP, using hex key
+.Dq 0x1deadbeef1 :
+.Bd -literal -offset indent
+# ifconfig ral0 nwkey 0x1deadbeef1
+.Ed
+.Pp
+Return ral0 to its default settings:
+.Bd -literal -offset indent
+# ifconfig ral0 -bssid -chan media autoselect -mediaopt \e
+	nwid "" -nwkey
+.Ed
 .Pp
-For more information on configuring this device, see
-.Xr ifconfig 8 .
+Join an existing BSS network,
+.Dq my_net :
+.Bd -literal -offset indent
+# ifconfig ral0 192.168.1.1 netmask 0xffffff00 nwid my_net
+.Ed
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "ral%d: device timeout"
@@ -55,8 +238,10 @@ This should not happen.
 .Xr arp 4 ,
 .Xr cardbus 4 ,
 .Xr ifmedia 4 ,
+.Xr intro 4 ,
 .Xr netintro 4 ,
 .Xr pci 4 ,
+.Xr hostname.if 5 ,
 .Xr ifconfig 8
 .Rs
 .%T Ralink Technology
diff --git a/share/man/man4/ray.4 b/share/man/man4/ray.4
index 0c8a029e28e..a442a5fa6e4 100644
--- a/share/man/man4/ray.4
+++ b/share/man/man4/ray.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ray.4,v 1.14 2004/11/09 22:01:59 jmc Exp $
+.\"	$OpenBSD: ray.4,v 1.15 2005/03/06 21:49:00 jmc Exp $
 .\"	$NetBSD: ray.4,v 1.5 2000/02/28 13:54:55 enami Exp $
 .\"
 .\" Copyright (c) 2000 Christian E. Hopps
@@ -31,8 +31,7 @@
 .Os
 .Sh NAME
 .Nm ray
-.Nd Raytheon Raylink/WebGear Aviator IEEE 802.11FH 2Mbps wireless
-network adapter
+.Nd Raytheon Raylink/WebGear Aviator IEEE 802.11FH wireless network driver
 .Sh SYNOPSIS
 .Cd "ray* at pcmcia?"
 .Cd "option RAY_PID_COUNTRY_CODE_DEFAULT=RAY_PID_COUNTRY_CODE_USA"
@@ -41,29 +40,6 @@ The
 .Nm
 device driver supports the Raytheon Raylink and Aviator 2.4/PRO
 802.11 Frequency Hopping 2Mbps wireless PCMCIA cards.
-The cards can be operated in either adhoc or infrastructure modes.
-The operating mode is selectable with
-.Xr ifconfig 8
-through a media option.
-.Pp
-Cards supported by the
-.Nm
-driver include:
-.Pp
-.Bl -item -offset indent -compact
-.It
-WebGear Aviator 2.4
-.It
-WebGear Aviator PRO
-.It
-Raytheon Raylink WLAN
-.El
-.Pp
-To communicate with other 802.11 cards a common network ID or NWID must
-be specified on each station that wishes to participate in the shared
-wireless network.
-The NWID can be set with
-.Xr ifconfig 8 .
 .Pp
 The device uses IEEE 802.11 standard Frequency Hopping Spread Spectrum
 signaling and operates in the ranges of 2.400 to 2.4835 Gigahertz.
@@ -72,62 +48,148 @@ that country's regulations.
 Currently the
 .Nm
 driver defaults to using the ranges appropriate for the USA.
-To change this setting you must define the kernel option
+To change this setting, define the kernel option
 .Dv RAY_PID_COUNTRY_CODE_DEFAULT
 to one of the following values:
-.Pp
-.Bl -item -offset indent -compact
-.It
-.Cd RAY_PID_COUNTRY_CODE_USA
-.It
-.Cd RAY_PID_COUNTRY_CODE_EUROPE
-.It
-.Cd RAY_PID_COUNTRY_CODE_JAPAN
-.It
-.Cd RAY_PID_COUNTRY_CODE_KOREA
-.It
-.Cd RAY_PID_COUNTRY_CODE_SPAIN
-.It
-.Cd RAY_PID_COUNTRY_CODE_FRANCE
-.It
-.Cd RAY_PID_COUNTRY_CODE_ISRAEL
-.It
-.Cd RAY_PID_COUNTRY_CODE_AUSTRALIA
-.El
+.Bd -literal -offset indent
+RAY_PID_COUNTRY_CODE_USA
+RAY_PID_COUNTRY_CODE_EUROPE
+RAY_PID_COUNTRY_CODE_JAPAN
+RAY_PID_COUNTRY_CODE_KOREA
+RAY_PID_COUNTRY_CODE_SPAIN
+RAY_PID_COUNTRY_CODE_FRANCE
+RAY_PID_COUNTRY_CODE_ISRAEL
+RAY_PID_COUNTRY_CODE_AUSTRALIA
+.Ed
 .Pp
 The output power of the transceiver is 100mW and the card's power consumption
 is 365 mA @ 5 volts.
 The transmission range in open air (line of sight)
-is a maximum of 1000 feet (or ~304 meters), and indoors (i.e., with
+is a maximum of 1000 feet (or ~304 meters), and indoors (i.e. with
 obstructions) it is a maximum of 500 feet (152 meters).
 .Pp
-.Tn Windows
-drivers may use one of two framing modes for wireless packets,
-"translation" and "encapsulation."
-"Encapsulation" is the only framing
-mode available when using some older
-.Tn Windows
-drivers.
+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 IBSS mode
+Also known as
+.Em IEEE ad-hoc
+mode or
+.Em peer-to-peer
+mode.
+This is the standardized method of operating without an access point.
+Stations associate with a service set.
+However, actual connections between stations are peer-to-peer.
+.El
+.Sh CONFIGURATION
+The
+.Nm
+driver can be configured at runtime with
+.Xr ifconfig 8
+or on boot with
+.Xr hostname.if 5
+using the following parameters:
+.Bl -tag -width Ds
+.It Cm bssid Ar bssid
+Set the desired BSSID.
+.It Fl bssid
+Unset the desired BSSID.
+The interface will automatically select a BSSID in this mode, which is
+the default.
+.It Cm chan Ar n
+Set the channel (radio frequency) to be used by the driver based on
+the given channel ID
+.Ar n .
+.It Fl chan
+Unset the desired channel to be used by the driver.
+The driver will automatically select a channel in this mode, which is
+the default.
+.It Cm media Ar media
+The
+.Nm
+driver supports the following
+.Ar media
+types:
+.Pp
+.Bl -tag -width autoselect -compact
+.It Cm autoselect
+Enable autoselection of the media type and options.
+.It Cm FH1
+Set legacy 802.11 FH 1Mbps operation.
+.It Cm FH2
+Set legacy 802.11 FH 2Mbps operation.
+.El
+.It Cm mediaopt Ar opts
+The
+.Nm
+driver supports the following media options:
+.Pp
+.Bl -tag -width monitor -compact
+.It Cm ibss
+Select IBSS operation.
+.El
+.It Fl mediaopt Ar opts
+Disable the specified media options on the driver and returns it to the
+default mode of operation (BSS).
+.It Cm nwid Ar id
+Set the network ID.
+The
+.Ar id
+can either be any text string up to 32 characters in length,
+or a series of hexadecimal digits up to 64 digits.
+An empty
+.Ar id
+string allows the interface to connect to any available access points.
+By default the
+.Nm
+driver uses an empty string.
+.El
+.Sh HARDWARE
+Cards supported by the
+.Nm
+driver include:
+.Pp
+.Bl -tag -width Ds -offset indent -compact
+.It Raytheon Raylink WLAN
+.It WebGear Aviator 2.4
+.It WebGear Aviator PRO
+.El
+.Sh EXAMPLES
+The following
+.Xr hostname.if 5
+example configures ray0 to join whatever network is available on boot,
+channel 11, obtaining an IP address using DHCP:
+.Bd -literal -offset indent
+dhcp NONE NONE NONE chan 11
+.Ed
+.Pp
+Return ray0 to its default settings:
+.Bd -literal -offset indent
+# ifconfig ray0 -bssid -chan media autoselect -mediaopt nwid ""
+.Ed
 .Pp
-Setting
-.Em link0
-flag on the interface allows the
-Ethernet2 in 802.11 "encapsulation" framing method used by
-older
-.Tn Windows
-drivers for the card.
-For all other purposes, link0 should not be used, and "translation"
-should be selected if you are given the option in a newer
-.Tn Windows
-driver.
+Join an existing BSS network,
+.Dq my_net :
+.Bd -literal -offset indent
+# ifconfig ray0 192.168.1.1 netmask 0xffffff00 nwid my_net
+.Ed
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "ray0: card failed self test: status x"
 Indicates the card has failed its initial startup tests.
 .El
 .Sh SEE ALSO
+.Xr arp 4 ,
 .Xr ifmedia 4 ,
 .Xr intro 4 ,
+.Xr netintro 4 ,
 .Xr pcmcia 4 ,
 .Xr hostname.if 5 ,
 .Xr ifconfig 8
@@ -148,10 +210,6 @@ and ported to
 .Ox
 by
 .An Michael Shalayeff Aq mickey@openbsd.org .
-Support for interoperating with newer
-.Tn Windows
-driver was added by
-.An Steve Weiss Aq srw@alum.mit.edu .
 .Sh BUGS
 Currently the infrastructure mode is untested, and authentication
 using WEP is unimplemented.
diff --git a/share/man/man4/rtw.4 b/share/man/man4/rtw.4
index e6a9c51dcbe..eecb2a9248a 100644
--- a/share/man/man4/rtw.4
+++ b/share/man/man4/rtw.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtw.4,v 1.7 2005/02/21 21:27:31 jsg Exp $
+.\"	$OpenBSD: rtw.4,v 1.8 2005/03/06 21:49:00 jmc Exp $
 .\"
 .\" Copyright (c) 2004 Jonathan Gray <jsg@openbsd.org>
 .\"
@@ -19,35 +19,208 @@
 .Os
 .Sh NAME
 .Nm rtw
-.Nd Realtek 8180 802.11B wireless network driver
+.Nd Realtek 8180 IEEE 802.11b wireless network driver
 .Sh SYNOPSIS
 .Cd "rtw* at cardbus?"
 .Cd "rtw* at pci?"
 .Sh DESCRIPTION
 The
 .Nm
-driver supports PCI/Cardbus 802.11B wireless adapters based on the
+driver supports PCI/Cardbus 802.11b wireless adapters based on the
 Realtek 8180.
-This includes:
 .Pp
-.Bl -tag -width Ds -offset indent -compact
-.It Corega CG-WLCB11V3 Cardbus card
-.It Netgear MA521 Cardbus card
+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 IBSS mode
+Also known as
+.Em IEEE ad-hoc
+mode or
+.Em peer-to-peer
+mode.
+This is the standardized method of operating without an access point.
+Stations associate with a service set.
+However, actual connections between stations are peer-to-peer.
+.It Host AP
+In this mode the driver acts as an access point (base station)
+for other cards.
+.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
-The operating mode is selected using the
-.Xr ifconfig 8
-utility.
-For more information on configuring this device, see
+.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.
+.Sh CONFIGURATION
+The
+.Nm
+driver can be configured at runtime with
 .Xr ifconfig 8
-and
-.Xr ifmedia 4 .
+or on boot with
+.Xr hostname.if 5
+using the following parameters:
+.Bl -tag -width Ds
+.It Cm bssid Ar bssid
+Set the desired BSSID.
+.It Fl bssid
+Unset the desired BSSID.
+The interface will automatically select a BSSID in this mode, which is
+the default.
+.It Cm chan Ar n
+Set the channel (radio frequency) to be used by the driver based on
+the given channel ID
+.Ar n .
+.It Fl chan
+Unset the desired channel to be used by the driver.
+The driver will automatically select a channel in this mode, which is
+the default.
+.It Cm media Ar media
+The
+.Nm
+driver supports the following
+.Ar media
+types:
+.Pp
+.Bl -tag -width autoselect -compact
+.It Cm autoselect
+Enable autoselection of the media type and options.
+.It Cm DS1
+Set 802.11b DS 1Mbps operation.
+.It Cm DS2
+Set 802.11b DS 2Mbps operation.
+.It Cm DS5
+Set 802.11b DS 5.5Mbps operation.
+.It Cm DS11
+Set 802.11b DS 11Mbps operation.
+.El
+.It Cm mediaopt Ar opts
+The
+.Nm
+driver supports the following media options:
+.Pp
+.Bl -tag -width monitor -compact
+.It Cm hostap
+Select Host AP operation.
+.It Cm ibss
+Select IBSS operation.
+.It Cm monitor
+Select monitor mode.
+.El
+.It Fl mediaopt Ar opts
+Disable the specified media options on the driver and returns it to the
+default mode of operation (BSS).
+.It Cm nwid Ar id
+Set the network ID.
+The
+.Ar id
+can either be any text string up to 32 characters in length,
+or a series of hexadecimal digits up to 64 digits.
+An empty
+.Ar id
+string allows the interface to connect to any available access points.
+By default the
+.Nm
+driver uses an empty string.
+.It Cm nwkey Ar key
+Enable WEP encryption using the specified
+.Ar key .
+The
+.Ar key
+can either be a string, a series of hexadecimal digits (preceded by
+.Sq 0x ) ,
+or a set of keys of the form
+.Dq n:k1,k2,k3,k4 ,
+where
+.Sq n
+specifies which of the keys will be used for transmitted packets,
+and the four keys,
+.Dq k1
+through
+.Dq k4 ,
+are configured as WEP keys.
+If a set of keys is specified, a comma
+.Pq Sq \&,
+within the key must be escaped with a backslash.
+Note that if multiple keys are used, their order must be the same within
+the network.
+.Nm
+is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
+or 104-bit (13 characters or 26 hexadecimal digits) keys.
+.It Fl nwkey
+Disable WEP encryption.
+This is the default mode of operation.
+.It Cm nwkey persist
+Enable WEP encryption with the persistent key stored in the network card.
+.El
+.Sh HARDWARE
+The following adapters are known to be supported:
+.Pp
+.Bl -tag -width Ds -offset indent -compact
+.It Corega CG-WLCB11V3 Cardbus
+.It Netgear MA521 Cardbus
+.El
+.Sh EXAMPLES
+The following
+.Xr hostname.if 5
+example configures rtw0 to join whatever network is available on boot,
+using WEP key
+.Dq 0x1deadbeef1 ,
+channel 11, obtaining an IP address using DHCP:
+.Bd -literal -offset indent
+dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+.Ed
+.Pp
+The following
+.Xr hostname.if 5
+example creates a host-based access point on boot:
+.Bd -literal -offset indent
+inet 192.168.1.1 255.255.255.0 NONE media autoselect \e
+	mediaopt hostap nwid my_net chan 11
+.Ed
+.Pp
+Configure rtw0 for WEP, using hex key
+.Dq 0x1deadbeef1 :
+.Bd -literal -offset indent
+# ifconfig rtw0 nwkey 0x1deadbeef1
+.Ed
+.Pp
+Return rtw0 to its default settings:
+.Bd -literal -offset indent
+# ifconfig rtw0 -bssid -chan media autoselect -mediaopt \e
+	nwid "" -nwkey
+.Ed
+.Pp
+Join an existing BSS network,
+.Dq my_net :
+.Bd -literal -offset indent
+# ifconfig rtw0 192.168.1.1 netmask 0xffffff00 nwid my_net
+.Ed
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr cardbus 4 ,
 .Xr ifmedia 4 ,
+.Xr intro 4 ,
 .Xr netintro 4 ,
 .Xr pci 4 ,
+.Xr hostname.if 5 ,
 .Xr ifconfig 8
 .Rs
 .%T Realtek
diff --git a/share/man/man4/wi.4tbl b/share/man/man4/wi.4tbl
index a4c08a18371..15c61353a57 100644
--- a/share/man/man4/wi.4tbl
+++ b/share/man/man4/wi.4tbl
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wi.4tbl,v 1.68 2005/03/06 12:53:25 jsg Exp $
+.\"	$OpenBSD: wi.4tbl,v 1.69 2005/03/06 21:49:00 jmc Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -37,7 +37,7 @@
 .Os
 .Sh NAME
 .Nm wi
-.Nd WaveLAN/IEEE, PRISM 2-3 and Spectrum24 802.11B wireless network interfaces
+.Nd "WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b wireless network driver"
 .Sh SYNOPSIS
 .Cd "# all architectures"
 .Cd "wi* at pci?"
@@ -50,63 +50,204 @@
 The
 .Nm
 driver provides support for wireless network adapters based around
-the Lucent Hermes, Intersil PRISM-2, Intersil PRISM-2.5, Intersil PRISM-3
+the Lucent Hermes, Intersil PRISM-2, Intersil PRISM-2.5, Intersil PRISM-3,
 and Symbol Spectrum24 chipsets.
 All five chipsets provide a similar interface to the driver.
 .Pp
-All host/device interaction is via programmed I/O.
-Supported features include 802.11 and 802.3 frames, power management, BSS,
-IBSS, WDS and ad-hoc operation modes.
-Cards based on the Intersil 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.
-.Pp
 The
 .Nm
-driver encapsulates all IP and ARP traffic as 802.11 frames, however
+driver encapsulates all IP and ARP traffic as 802.11 frames, though
 it can receive either 802.11 or 802.3 frames.
 Transmit speed is selectable between 1Mbps fixed, 2Mbps fixed, 2Mbps
-with auto fallback, 5.5Mbps, 8Mbps, or 11Mbps depending on your hardware.
+with auto fallback, 5.5Mbps, 8Mbps, or 11Mbps, depending on hardware.
+.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 IBSS mode
+Also known as
+.Em IEEE ad-hoc
+mode or
+.Em peer-to-peer
+mode.
+This is the standardized method of operating without an access point.
+Stations associate with a service set.
+However, actual connections between stations are peer-to-peer
+as in ad-hoc mode.
+Cards with very old firmware revisions do not support this mode.
+.It IBSS master
+Also know as
+.Em Host IBSS
+mode.
+In this mode the station takes on part of the role of an access point,
+though traffic does not pass through it to reach the other stations.
+When a group of stations are operating in IBSS mode, one of them must be
+the master, specifying the network name of the service set.
+.It Host AP
+In this mode the driver acts as an access point (base station)
+for other cards.
+Only cards based on the Intersil chipsets support this mode.
+Furthermore, this mode is not supported on USB devices.
+.It ad-hoc mode
+More accurately known as
+.Em ad-hoc demo mode .
+This mode does not require an access point; the adapter communicates with
+other ad-hoc stations within range on a peer-to-peer basis.
+This mode is not specified by the IEEE 802.11 standard and there
+may be problems interoperating with adapters manufactured by different vendors.
+.El
+.Pp
+.Nm
+supports both software and hardware 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.
+.Pp
 The Lucent WaveLAN/IEEE Silver and Gold cards as well as the Intersil
 and Symbol cards have support for WEP encryption.
 The WaveLAN Gold as well as newer Intersil and Symbol cards support
-104bit keys, the others only accept 40bit keys.
+104-bit keys, the others only accept 40-bit keys.
 The Lucent WaveLAN/IEEE Bronze cards do not support WEP at all.
-To enable encryption, use the
-.Xr wicontrol 8
-utility to set your keys, or use
+See also
+.Sx CAVEATS
+below.
+.Sh CONFIGURATION
+The
+.Nm
+driver can be configured using
+.Xr wicontrol 8 .
+It can also be configured at runtime with
 .Xr ifconfig 8
-as shown below.
-.Pp
-By default, the
+or on boot with
+.Xr hostname.if 5
+using the following parameters:
+.Bl -tag -width Ds
+.It Cm bssid Ar bssid
+Set the desired BSSID.
+.It Fl bssid
+Unset the desired BSSID.
+The interface will automatically select a BSSID in this mode, which is
+the default.
+.It Cm chan Ar n
+Set the channel (radio frequency) to be used by the driver based on
+the given channel ID
+.Ar n .
+.It Fl chan
+Unset the desired channel to be used by the driver.
+The driver will automatically select a channel in this mode, which is
+the default.
+.It Cm media Ar media
+The
 .Nm
-driver configures the card for BSS operation (aka infrastructure
-mode).
-This mode requires the use of an access point (base station).
-.Pp
+driver supports the following
+.Ar media
+types:
+.Pp
+.Bl -tag -width autoselect -compact
+.It Cm autoselect
+Enable autoselection of the media type and options.
+.It Cm DS1
+Set 802.11b DS 1Mbps operation.
+.It Cm DS2
+Set 802.11b DS 2Mbps operation.
+.It Cm DS5
+Set 802.11b DS 5.5Mbps operation.
+.It Cm DS11
+Set 802.11b DS 11Mbps operation.
+.El
+.It Cm mediaopt Ar opts
 The
 .Nm
-driver also supports an ad-hoc (point-to-point) mode where
-the nwid is ignored and stations can communicate amongst
-themselves without the aid of an access point.
-Note that there are two possible ad-hoc modes.
-One mode, referred to as
-.Dq ad-hoc demo mode ,
-predates the IEEE 802.11 specification and so may not interoperate
-with cards from other vendors.
-The standardized ad-hoc mode, also known as IBSS mode, is not
-supported by cards with very old firmware revisions.
-.Pp
-Cards based on the Intersil chipsets also have a host-based access point
-mode which allows the card to act as an access point (base station).
-.Pp
-For more information on configuring this device, see
-.Xr ifconfig 8 .
-.Pp
+driver supports the following media options:
+.Pp
+.Bl -tag -width ibss-master -compact
+.It Cm adhoc
+Select ad-hoc demo mode.
+.It Cm hostap
+Select Host AP operation.
+.It Cm ibss
+Select IBSS operation.
+.It Cm ibss-master
+Select IBSS master operation.
+.El
+.It Fl mediaopt Ar opts
+Disable the specified media options on the driver and returns it to the
+default mode of operation (BSS).
+.It Cm nwid Ar id
+Set the network ID.
+The
+.Ar id
+can either be any text string up to 32 characters in length,
+or a series of hexadecimal digits up to 64 digits.
+An empty
+.Ar id
+string allows the interface to connect to any available access points.
+By default the
+.Nm
+driver uses an empty string.
+.It Cm nwkey Ar key
+Enable WEP encryption using the specified
+.Ar key .
+The
+.Ar key
+can either be a string, a series of hexadecimal digits (preceded by
+.Sq 0x ) ,
+or a set of keys of the form
+.Dq n:k1,k2,k3,k4 ,
+where
+.Sq n
+specifies which of the keys will be used for transmitted packets,
+and the four keys,
+.Dq k1
+through
+.Dq k4 ,
+are configured as WEP keys.
+If a set of keys is specified, a comma
+.Pq Sq \&,
+within the key must be escaped with a backslash.
+Note that if multiple keys are used, their order must be the same within
+the network.
+.Nm
+is capable of using both 40-bit (5 characters or 10 hexadecimal digits)
+or 104-bit (13 characters or 26 hexadecimal digits) keys.
+.It Fl nwkey
+Disable WEP encryption.
+This is the default mode of operation.
+.It Cm nwkey persist
+Enable WEP encryption with the persistent key stored in the network card.
+.It Cm nwkey persist : Ns Ar key
+Write
+.Ar key
+to the persistent memory of the network card,
+and enable WEP encryption using that key.
+.It Cm powersave
+Enable power saving mode.
+.It Fl powersave
+Disable power saving mode.
+This is the default mode of operation.
+.It Cm powersavesleep Ar duration
+Set the receiver sleep duration (in milliseconds) for power saving mode.
+.It Cm txpower Ar dBm
+Set the transmit power
+(and disable any auto level and transmit power controls).
+.It Fl txpower
+Disable manual transmit power
+(and enable any auto level and transmit power controls).
+This is the default mode of operation.
+.El
+.Sh HARDWARE
 Cards supported by the
 .Nm
 driver come in a variety of packages, though the most common
@@ -119,7 +260,6 @@ A true PCMCIA bridge (such as those sold by Lucent) will attach
 as a real PCMCIA controller.
 The wireless card will then attach to the PCMCIA bus.
 Wireless cards in PCMCIA slots may be inserted and ejected on the fly.
-.Pp
 A dumb bridge, on the other hand, does not show up as a true PCMCIA bus.
 The wireless card will simply appear to the host as a normal PCI
 device and will not require any PCMCIA support.
@@ -221,6 +361,7 @@ Proxim Harmony:Prism-2:PCMCIA
 Proxim RangeLAN-DS:Prism-2:PCMCIA
 Samsung MagicLAN SWL-2000N:Prism-2:PCMCIA
 Samsung MagicLAN SWL-2210P:Prism-2:PCI
+Senao NL-2511MP:Prism-2.5:PCI
 Siemens SpeedStream SS1021:Prism-2:PCMCIA
 Siemens SpeedStream SS1022:Prism-3:USB
 Sitecom WL-022:Prism-3:USB
@@ -241,7 +382,7 @@ ZyXEL ZyAIR B-200:Prism-3:USB
 Note that some of the PRISM-II adapters only work at 3.3V, hence
 .Xr cardbus 4
 support is required for those cards to set VCC correctly, even
-though they are really 16bit cards.
+though they are really 16-bit cards.
 .Pp
 USB support is still experimental and the device may stop functioning
 during normal use.
@@ -262,81 +403,10 @@ The following such adapters are supported or expected to work:
 .It LinkSys WDT11 (a rebadged GL24110P02)
 .It Longshine 8031
 .It Netgear MA301
-.It US Robotics 2415 (rebadged WL11000P)
 .It Siemens/Efficient Networks SpeedStream 1023
+.It US Robotics 2415 (rebadged WL11000P)
 .El
 .Sh EXAMPLES
-The following examples utilize
-.Xr ifconfig 8
-for simplicity, however,
-.Xr wicontrol 8
-can also be used to set wireless parameters.
-.Pp
-Join an existing BSS network (ie: connect to an access point):
-.Dl # ifconfig wi0 inet 192.168.0.20 netmask 0xffffff00
-.Pp
-Join a specific BSS network with network name
-.Dq my_net :
-.Dl # ifconfig wi0 inet 192.168.0.20 netmask 0xffffff00 nwid my_net
-.Pp
-Join a specific BSS network with WEP encryption:
-.Bd -literal -compact -offset indent
-# ifconfig wi0 inet 192.168.0.20 netmask 0xffffff00 nwid my_net \e
-	nwkey 0x8736639624
-.Ed
-.Pp
-Join an ad-hoc network with network name
-.Dq my_net :
-.Bd -literal -compact -offset indent
-# ifconfig wi0 inet 192.168.0.20 netmask 0xffffff00 nwid my_net \e
-	mediaopt adhoc
-.Ed
-.Pp
-Create an IBSS network with network name
-.Dq my_net :
-.Bd -literal -compact -offset indent
-# ifconfig wi0 inet 192.168.0.20 netmask 0xffffff00 nwid my_net \e
-	mediaopt ibss-master
-.Ed
-.Pp
-Join an IBSS network with network name
-.Dq my_net :
-.Bd -literal -compact -offset indent
-# ifconfig wi0 inet 192.168.0.22 netmask 0xffffff00 nwid my_net \e
-	mediaopt ibss
-.Ed
-.Pp
-Create a host-based access point (Prism only):
-.Bd -literal -compact -offset indent
-# ifconfig wi0 inet 192.168.0.10 netmask 0xffffff00 nwid my_ap \e
-	mediaopt hostap
-.Ed
-.Pp
-Create a host-based access point with WEP enabled (Prism only):
-.Bd -literal -compact -offset indent
-# ifconfig wi0 inet 192.168.0.10 netmask 0xffffff00 nwid my_ap \e
-	nwkey 0x1234567890 mediaopt hostap
-.Ed
-.Pp
-Create a host-based wireless bridge to fxp0 (Prism only):
-.Bd -literal -compact -offset indent
-# ifconfig wi0 inet up nwid my_ap mediaopt hostap
-# brconfig bridge0 add fxp0 add wi0 up
-.Ed
-.Pp
-The following examples utilize
-.Xr wicontrol 8
-to set options not supported by
-.Xr ifconfig 8 .
-.Pp
-Enable software-based WEP (Prism only, see
-.Sx CAVEATS
-below):
-.Dl # wicontrol wi0 -x 1
-.Pp
-Hide the SSID of a HostAP server (Prism only, requires firmware >= 1.6.3)
-.Dl # wicontrol wi0 -E 3
-.Pp
 Note that when setting options via
 .Xr wicontrol 8
 in a
@@ -358,7 +428,33 @@ inet 192.168.1.1 255.255.255.0 NONE nwid my_net \e
 	nwkey 0x8736639624 mediaopt hostap
 .Ed
 .Pp
-Note that the line beginning with "inet" has been split for readability.
+The following
+.Xr hostname.if 5
+example configures wi0 to join whatever network is available on boot,
+using WEP key
+.Dq 0x1deadbeef1 ,
+channel 11, obtaining an IP address using DHCP:
+.Bd -literal -offset indent
+dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
+.Ed
+.Pp
+Configure wi0 for WEP, using hex key
+.Dq 0x1deadbeef1 :
+.Bd -literal -offset indent
+# ifconfig wi0 nwkey 0x1deadbeef1
+.Ed
+.Pp
+Return wi0 to its default settings:
+.Bd -literal -offset indent
+# ifconfig wi0 -bssid -chan media autoselect -mediaopt \e
+	nwid "" -nwkey -powersave -txpower
+.Ed
+.Pp
+Join an existing BSS network,
+.Dq my_net :
+.Bd -literal -offset indent
+# ifconfig wi0 192.168.1.1 netmask 0xffffff00 nwid my_net
+.Ed
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "wi%d: init failed"
@@ -375,7 +471,6 @@ command.
 .Xr arp 4 ,
 .Xr ifmedia 4 ,
 .Xr intro 4 ,
-.Xr macobio 4 ,
 .Xr netintro 4 ,
 .Xr pci 4 ,
 .Xr pcmcia 4 ,
@@ -424,7 +519,7 @@ bugs when used with firmware versions prior to 0.8.3 and is completely
 unusable with firmware versions prior to 0.8.0 and 1.4.0-1.4.2.
 .Pp
 Software WEP is currently only supported in HostAP and BSS modes.
-Furthermore, Software WEP is currently incapable of decrypting
+Furthermore, software WEP is currently incapable of decrypting
 fragmented frames.
 Lucent-based cards using firmware 8.10 and above fragment encrypted
 frames sent at 11Mbps.