- Fix up some comments in if_wi.c (no code changes)

- Mention that the 6Mbps turbo adapters are supported in HARDWARE.TXT
  and RELNOTES.TXT and the wi.4 man page
- Mention turbo adapters in the wicontrol.8 man page and provide a
  complete table of available transmit speed settings

2 files changed, 27 insertions, 9 deletions

diff --git a/usr.sbin/wicontrol/wicontrol.8 b/usr.sbin/wicontrol/wicontrol.8
index 7ce5c04..d0310d0 100644
--- a/usr.sbin/wicontrol/wicontrol.8
+++ b/usr.sbin/wicontrol/wicontrol.8
@@ -98,10 +98,28 @@ flag will cause
 .Nm
 to print out the statistics counters instead of the card settings.
 .It Fl i Ar iface Fl t Ar tx rate
-Set the transmit rate of the specified interface. The permitted values
-for the transmit rate are 1, 2 and 3, where 1 is fixed 1Mbps, 2 is
-fixed 2Mbps and 3 is 2Mbps with automatic fallback to 1Mbps. The default
-driver setting is 3.
+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:
+.Bd -filled -offset indent
+.Bl -column "TX rate " "NIC speed "
+.Em "TX rate	NIC speed"
+1	Fixed Low (1Mbps)
+2	Fixed Standard (2Mbps)
+3	Auto Rate Select (High)
+4	Fixed Medium (4Mbps)
+5	Fixed High (6Mbps)
+6	Auto Rate Select (Standard)
+7	Auto Rate Select (Medium)
+.El
+.Ed
+.Pp
+The standard NICs support only settings 1 through 3. Turbo NICs support
+all the above listed speed settings.
+The default driver setting is 3 (auto rate select).
 .It Fl i Ar iface Fl n Ar network name
 Set the name of the service set (IBSS) that this station wishes to
 join. The
@@ -122,7 +140,7 @@ Sets the
 for the specified interface. The
 .Ar station name
 is used for diagnostic purposes. The Lucent WaveMANAGER sofware can
-poll the names of remove hosts.
+poll the names of remote hosts.
 .It Fl i Ar iface Fl c Ar 0|1
 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
@@ -215,7 +233,7 @@ 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 i Ar iface Fl S Ar max sleep interval
+.It Fl i Ar iface Fl S Ar max_sleep_interval
 Specify the sleep interval to use when power management is enabled.
 The
 .Are max sleep interval
diff --git a/usr.sbin/wicontrol/wicontrol.c b/usr.sbin/wicontrol/wicontrol.c
index 08009f9..e22d3da 100644
--- a/usr.sbin/wicontrol/wicontrol.c
+++ b/usr.sbin/wicontrol/wicontrol.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: wicontrol.c,v 1.18 1999/05/14 15:40:19 wpaul Exp $
+ *	$Id: wicontrol.c,v 1.19 1999/05/22 15:43:02 wpaul Exp $
  */
 
 #include <sys/types.h>
@@ -56,7 +56,7 @@
 static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
 	Bill Paul. All rights reserved.";
 static const char rcsid[] =
-	"@(#) $Id: wicontrol.c,v 1.18 1999/05/14 15:40:19 wpaul Exp $";
+	"@(#) $Id: wicontrol.c,v 1.19 1999/05/22 15:43:02 wpaul Exp $";
 #endif
 
 static void wi_getval		__P((char *, struct wi_req *));
@@ -304,7 +304,7 @@ static struct wi_table wi_table[] = {
 	{ WI_RID_PROMISC, WI_BOOL, "Promiscuous mode:\t\t\t" },
 	{ WI_RID_PORTTYPE, WI_WORDS, "Port type (1=BSS, 3=ad-hoc):\t\t"},
 	{ WI_RID_MAC_NODE, WI_HEXBYTES, "MAC address:\t\t\t\t"},
-	{ WI_RID_TX_RATE, WI_WORDS, "TX rate (1=1Mbps, 2=2Mbps, 3=auto):\t"},
+	{ WI_RID_TX_RATE, WI_WORDS, "TX rate:\t\t\t\t"},
 	{ WI_RID_RTS_THRESH, WI_WORDS, "RTS/CTS handshake threshold:\t\t"},
 	{ WI_RID_CREATE_IBSS, WI_BOOL, "Create IBSS:\t\t\t\t" },
 	{ WI_RID_SYSTEM_SCALE, WI_WORDS, "Access point density:\t\t\t" },