[src/netbsd-1-5]: src Pullup 802.11 stuff (approved by jhawk)

[onoe <onoe%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/63fc8a54b57a
branches:  netbsd-1-5
changeset: 488620:63fc8a54b57a
user:      onoe <onoe%NetBSD.org@localhost>
date:      Fri Jul 21 18:59:13 2000 +0000

description:
Pullup 802.11 stuff (approved by jhawk)
- clarify the restriction for nwid/nwkey, add supported hardwares.
        basesrc/sbin/ifconfig/ifconfig.8                1.40-1.41
        saresrc/share/man/man4/awi.4                    1.9
        saresrc/share/man/man4/wi.4                     1.11

diffstat:

 sbin/ifconfig/ifconfig.8 |  13 ++++++++--
 share/man/man4/awi.4     |  13 ++++++----
 share/man/man4/wi.4      |  55 +++++++++++++++++++++++++++++++++++++----------
 3 files changed, 61 insertions(+), 20 deletions(-)

diffs (208 lines):

diff -r 883ff1ff4bde -r 63fc8a54b57a sbin/ifconfig/ifconfig.8
--- a/sbin/ifconfig/ifconfig.8  Fri Jul 21 18:55:56 2000 +0000
+++ b/sbin/ifconfig/ifconfig.8  Fri Jul 21 18:59:13 2000 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ifconfig.8,v 1.32.4.5 2000/07/21 18:55:57 onoe Exp $
+.\"    $NetBSD: ifconfig.8,v 1.32.4.6 2000/07/21 18:59:14 onoe Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -298,8 +298,12 @@
 .It Cm nwid Ar id
 (IEEE 802.11 devices only)
 Configure network ID for IEEE 802.11-based wireless network interfaces.
-.Ar Id
-can either be a string or a series of hexadecimal digits.
+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.
+The empty string allows the inteface to connect to any available
+access points.
 .It Cm nwkey Ar key
 (IEEE 802.11 devices only)
 Enable WEP encryption for IEEE 802.11-based wireless network interfaces
@@ -320,6 +324,9 @@
 are configured as WEP keys.
 Note that the order must be match within same network if multiple keys
 are used.
+For IEEE 802.11 wireless network, the length of each key is restricted to
+40 bits, i.e. 5-character string or 10 hexadecimal digits,
+while the WaveLAN/IEEE Gold cards accept the 104 bits (13 characters) key.
 .It Fl nwkey
 (IEEE 802.11 devices only)
 Disable WEP encryption for IEEE 802.11-based wireless network interfaces.
diff -r 883ff1ff4bde -r 63fc8a54b57a share/man/man4/awi.4
--- a/share/man/man4/awi.4      Fri Jul 21 18:55:56 2000 +0000
+++ b/share/man/man4/awi.4      Fri Jul 21 18:59:13 2000 +0000
@@ -1,4 +1,4 @@
-.\"     $NetBSD: awi.4,v 1.7.2.1 2000/07/14 14:37:58 onoe Exp $
+.\"     $NetBSD: awi.4,v 1.7.2.2 2000/07/21 18:59:13 onoe Exp $
 .\"
 .Dd October 31, 1999
 .Dt AWI 4 
@@ -14,7 +14,8 @@
 The
 .Nm
 driver supports various IEEE 802.11 wireless cards
-which run AMD PCnetMobile firmware based on AMD 79c930 controller.
+which run AMD PCnetMobile firmware based on AMD 79c930 controller
+with Intersil (formerly Harris) PRISM radio chipset.
 It 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
@@ -37,8 +38,8 @@
 .Pp
 In addition to these two mode in IEEE 802.11 specification, the
 .Nm
-driver also supports a variant of adhoc mode out of spec, which makes
-possible to communicate with adhoc mode of
+driver also supports a variant of adhoc mode out of spec for DS radio cards,
+which makes possible to communicate with adhoc mode of
 .Xr wi 8
 driver.  The NWID doesn't affect in this mode.
 .Pp
@@ -74,6 +75,8 @@
 .Pp
 The original Xircom Netwave AirSurfer is supported by the 
 .Xr cnw 4
+driver, and the PRISM-II cards are supported by the
+.Xr wi 4
 driver.
 .Sh MEDIA SELECTION
 The DS cards support
@@ -85,7 +88,7 @@
 media type.  For each media type,
 .Em adhoc
 mediaopt can be used to indicate the driver to operate in adhoc mode.
-Also,
+For DS radio cards,
 .Em adhoc,flag0
 mediaopt can be used for
 .Xr wi 4
diff -r 883ff1ff4bde -r 63fc8a54b57a share/man/man4/wi.4
--- a/share/man/man4/wi.4       Fri Jul 21 18:55:56 2000 +0000
+++ b/share/man/man4/wi.4       Fri Jul 21 18:59:13 2000 +0000
@@ -1,4 +1,4 @@
-.\"     $NetBSD: wi.4,v 1.10 2000/03/21 19:59:16 drochner Exp $
+.\"     $NetBSD: wi.4,v 1.10.6.1 2000/07/21 18:59:13 onoe Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"    Bill Paul <wpaul%ctr.columbia.edu@localhost>. All rights reserved.
@@ -30,34 +30,41 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"    $Id: wi.4,v 1.10 2000/03/21 19:59:16 drochner Exp $
+.\"    $Id: wi.4,v 1.10.6.1 2000/07/21 18:59:13 onoe Exp $
 .\"
-.Dd April 21, 1999
+.Dd July 21, 2000
 .Dt WI 4 
 .Os 
 .Sh NAME
 .Nm wi
 .Nd
-Lucent Technologies WaveLAN/IEEE 802.11 PCMCIA wireless network driver
+WaveLAN/IEEE and PRISM-II 802.11 PCMCIA wireless network driver
 .Sh SYNOPSIS
 .Cd "wi* at pcmcia? function ?"
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for WaveLAN/IEEE PCCARD adapters (also known
-as WaveLAN II cards).
+driver provides support for Lucent Technologies WaveLAN/IEEE PCCARD adapters
+(also known as WaveLAN II cards) and various PCCARD adapters which use
+Intersil PRISM-II chipsets.
 Note that while Lucent sells both ISA and PCMCIA WaveLAN/IEEE devices,
 the ISA product is actually a PCMCIA card in an ISA to PCMCIA bridge adapter.
 Consequently, the
 .Nm
 driver is required for both the ISA and PCMCIA NICs.
-Both the original 2Mbps WaveLAN/IEEE cards and
-the newer 6Mbps WaveLAN/IEEE Turbo adapters are supported.
+Also note that some of the PRISM-II adapters works only at 3.3V, hence
+.Xr cardbus 4
+support is required for those cards to set VCC correctly,
+even they are 16bit cards.
 .Pp
 The core of the WaveLAN/IEEE is the Lucent Hermes controller.
 All host/device interaction is via programmed I/O with the Hermes.
 The Hermes supports 802.11 and 802.3 frames, power management, BSS, WDS
-and ad-hoc operation modes.
+and ad-hoc operation modes.  The Silver and the Gold cards of the
+WaveLAN/IEEE also support WEP.  Unlike the other IEEE 802.11 network cards,
+the WaveLAN Gold cards accept 104 bits key (13 characters) for WEP
+encryption.  The Intersil PRISM-II controller supports WEP as well.
+.Pp
 The
 .Nm
 driver encapsulates all IP and ARP traffic as 802.11 frames, however
@@ -65,19 +72,27 @@
 Transmit speed is selectable between 1Mbps fixed,
 2Mbps fixed or 2Mbps with auto fallback.
 For WaveLAN/IEEE Turbo adapters, speeds up to 6Mbps are available.
+For WaveLAN/IEEE Turbo 11Mbps adapters and PRISM-II adapters, speeds up to
+11Mbps are available.
 .Pp
 By default, the
 .Nm
-driver configures the WaveLAN card for ad-hoc operation.
-In this mode,
+driver configures the WaveLAN card for special ad-hoc operation.
+In this mode, the nwid is ignored and
 stations can communicate among each other without the aid of an access
 point.
+Note that this mode is out of IEEE 802.11 specification and the driver
+cannot interoperate with other cards.
 To join a service set, the driver must be set for BSS mode using the
+.Xr ifconfig 8
+or
 .Xr wiconfig 8
 utility.
 .Pp
 For more information on configuring this device, see
-.Xr ifconfig 8 .
+.Xr ifconfig 8
+and
+.Xr ifmedia 4 .
 .Sh HARDWARE
 Cards supported by the
 .Nm
@@ -89,10 +104,20 @@
 .It
 Lucent Wavelan/IEEE 2.0Mb Silver
 .It
+Lucent WaveLAN/IEEE Turbo
+.It
+Lucent WaveLAN/IEEE Turbo 11Mbps
+.It
 Melco AIR CONNECT WLI-PCM-L11
 .It
 DEC/Cabletron RoamAbout 802.11 DS High Rate
+.It
+Corega Wireless LAN PCC-11
 .El
+.Pp
+The original PRISM-I chipset is supported by the
+.Xr awi 4
+driver.
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "wi%d: init failed"
@@ -107,8 +132,14 @@
 One reason can be that the board is mis-configured, see
 .Xr wiconfig 8 .
 .El
+.Sh BUGS
+The IBSS mode is not supported.
+The execution of
+.Xr wiconfig 8
+during the interface is down produces some error messages.
 .Sh SEE ALSO
 .Xr arp 4 ,
+.Xr ifmedia 4 ,
 .Xr netintro 4 , 
 .Xr ifconfig 8 ,
 .Xr wiconfig 8