Sync with the new options from NetBSD. Also fix gold card WEP description,

it is 104-bit, not 128-bit.

1 files changed, 55 insertions, 27 deletions

diff --git a/sbin/wicontrol/wicontrol.8 b/sbin/wicontrol/wicontrol.8
index e5d937d1e55..f6b58ce716b 100644
--- a/sbin/wicontrol/wicontrol.8
+++ b/sbin/wicontrol/wicontrol.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wicontrol.8,v 1.18 2000/11/09 23:49:04 deraadt Exp $
+.\"	$OpenBSD: wicontrol.8,v 1.19 2001/06/07 23:20:59 millert Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ctr.columbia.edu> All rights reserved.
@@ -30,9 +30,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	From: wicontrol.8,v 1.6 1999/05/22 16:12:47 wpaul Exp $
+.\"	$FreeBSD: wicontrol.8,v 1.6 1999/05/22 16:12:47 wpaul Exp $
 .\"
-.Dd April 21, 1999
+.Dd June 7, 2001
 .Dt WICONTROL 8
 .Os
 .Sh NAME
@@ -55,7 +55,10 @@
 .Op Fl d Ar max data length
 .Op Fl r Ar RTS threshold
 .Op Fl f Ar frequency
+.Op Fl A Ar 0|1
+.Op Fl M Ar 0|1
 .Op Fl P Ar 0|1
+.Op Fl R Ar 1|3
 .Op Fl S Ar max sleep duration
 .Op Fl T Ar 1|2|3|4
 .Sh DESCRIPTION
@@ -72,7 +75,10 @@ IEEE 802.11 protocol which the WaveLAN implements.
 This includes
 the station name, whether the station is operating in ad-hoc (point
 to point) or BSS (service set) mode, and the network name of a service
-set to join (IBSS) if BSS mode is enabled.
+set to join (IBSS) if BSS mode is enabled.  The
+.Nm
+command can also be used to view the current settings of these parameters
+and to dump out the values of the card's statistics counters.
 .Pp
 The
 .Ar iface
@@ -91,6 +97,7 @@ The options are as follows:
 .It Fl o
 Display the statistics counters for the specified WaveLAN/IEEE
 interface.
+Note however, that the statictics are updated about once a minute.
 .It Fl e Ar 0|1
 Enable or disable WEP encryption.
 Permitted values are
@@ -115,8 +122,10 @@ For WaveLAN Silver cards, the key is
 restricted to 40 bits, hence the key can be either a 5-character text string
 or 10 hexadecimal digits.
 For WaveLAN Gold cards, the key can be up to
-128 bits, which means the key can be specified as either a 16-character
-text string or 32 hexadecimal digits.
+104 bits, which means the key can be specified as either a 13-character
+text string or 26 hexadecimal digits.
+The key will be combined with the 24-bit IV to consist the seed
+for RC4 in either case.
 .It Fl T Ar 1|2|3|4
 Specify which of the four WEP encryption keys will be used to encrypt
 transmitted packets.
@@ -125,11 +134,10 @@ Set the transmit rate of the specified interface.
 The legal values
 for the transmit rate vary depending on whether the interface is a
 standard WaveLAN/IEEE or a WaveLAN/IEEE Turbo adapter.
-The standard
-NICs support a maximum transmit rate of 2Mbps while the turbo NICs
-support a maximum speed of 6Mbps.
-The following table shows the
-legal transmit rate settings and the corresponding transmit speeds:
+The standard NICs support a maximum transmit rate of 2Mbps while the
+turbo NICs support a maximum speed of 6Mbps.
+The following table shows the legal transmit rate settings
+and the corresponding transmit speeds:
 .Bd -filled -offset indent
 .Bl -column "TX rate " "NIC speed "
 .Em "TX rate	NIC speed"
@@ -140,6 +148,7 @@ legal transmit rate settings and the corresponding transmit speeds:
 5	Fixed High (6Mbps)
 6	Auto Rate Select (Standard)
 7	Auto Rate Select (Medium)
+11	Fixed Turbo (11Mbps)
 .El
 .Ed
 .Pp
@@ -151,9 +160,8 @@ Set the name of the service set (IBSS) that this station wishes to join.
 The
 .Ar network name
 can be any text string up to 30 characters in length.
-The default name
-is the empty string which should allow the station to connect to the first
-available access point.
+The default name is the empty string which should allow
+the station to connect to the first available access point.
 The interface should be set for BSS mode using the
 .Fl p
 flag in order for this to work.
@@ -166,7 +174,7 @@ The
 is used for diagnostic purposes.
 The Lucent WaveMANAGER sofware can poll the names of remote hosts.
 .It Fl c Ar 0|1
-Allow the station to create a service set (IBSS).
+[Lucent only] Allow the station to create a service set (IBSS).
 Permitted values are 0 (don't create IBSS) and 1 (enable creation of IBSS).
 The default is 0.
 .Pp
@@ -187,12 +195,11 @@ for a specified interface.
 The legal values for
 .Ar port type
 are 1 (BSS mode) and 3 (ad-hoc) mode.
-In ad-hoc mode, the station can
-communicate directly with any other stations within direct radio range
-(provided that they are also operating in ad-hoc mode).
-In BSS mode,
-hosts must associate with a service set controlled by an access point,
-which relays traffic between end stations.
+In ad-hoc mode, the station can communicate directly with any other
+stations within direct radio range (provided that they are also
+operating in ad-hoc mode).
+In BSS mode, hosts must associate with a service set controlled by
+an access point, which relays traffic between end stations.
 The default setting is 3 (ad-hoc mode).
 .It Fl a Ar access_point_density
 Specify the
@@ -258,20 +265,41 @@ For NICs sold in Japan, the default channel is 14, and it is
 the only available channel for pre-11Mbps NICs.
 Note that two stations must be set to the same channel in order to
 communicate.
+.It Fl A Ar 0|1
+[Prism2 only] Sets the authentication type for a given interface.
+Permitted values are
+.Ar 1  
+(Open System Authentication) or
+.Ar 2  
+(Shared Key Authentication).
+The default is 1.
+.Pp
+Note: It is not valid to enable Shared Key Authentication
+when no valid WEP keys have been defined.
+.It Fl M Ar 0|1
+Enable or disable
+.Dq microwave oven robustness
+on a given interface.
 .It Fl P Ar 0|1
 Enable or disable power management on a given interface.
 Enabling power management uses an alternating sleep/wake protocol to help
 conserve power on mobile stations, at the cost of some increased
 receive latency.
 Power management is off by default.
-Note that power
-management requires the cooperation of an access point in order to
-function; it is not functional in ad-hoc mode.
-Also, power management
-is only implemented in Lucent WavePOINT firmware version 2.03 or
-later, and in WaveLAN PCMCIA adapter firmware 2.00 or later.
+Note that power management requires the cooperation of an access
+point in order to function; it is not functional in ad-hoc mode.
+Also, power management is only implemented in Lucent WavePOINT
+firmware version 2.03 or later, and in WaveLAN PCMCIA adapter
+firmware 2.00 or later.
 Older revisions will silently ignore the power management setting.
 Legal values for this parameter are 0 (off) and 1 (on).
+.It Fl R Ar 1|3
+Enable or disable roaming function on a given interface.
+The legal values are
+.Ar 1
+(Roaming handled by firmware) and
+.Ar 3
+(Roaming Disabled). The default is 1.
 .It Fl S Ar max sleep interval
 Specify the sleep interval to use when power management is enabled.
 The