Module Name: src
Committed By: dyoung
Date: Thu Jul 2 17:45:26 UTC 2009
Modified Files:
src/sbin/ifconfig: ifconfig.8
src/usr.sbin/wiconfig: wiconfig.8
Log Message:
Deprecate wiconfig's -r, -g, -m options. Note that equivalent
options are available in ifconfig(8).
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sbin/ifconfig/ifconfig.8
cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/wiconfig/wiconfig.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/ifconfig.8
diff -u src/sbin/ifconfig/ifconfig.8:1.96 src/sbin/ifconfig/ifconfig.8:1.97
--- src/sbin/ifconfig/ifconfig.8:1.96 Wed Apr 8 14:32:05 2009
+++ src/sbin/ifconfig/ifconfig.8 Thu Jul 2 17:45:25 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: ifconfig.8,v 1.96 2009/04/08 14:32:05 joerg Exp $
+.\" $NetBSD: ifconfig.8,v 1.97 2009/07/02 17:45:25 dyoung Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)ifconfig.8 8.4 (Berkeley) 6/1/94
.\"
-.Dd March 27, 2009
+.Dd July 2, 2009
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -372,6 +372,15 @@
.Pq IEEE 802.11 devices only
Configure the fragmentation threshold for IEEE 802.11-based wireless
network interfaces.
+.It Cm rts Ar threshold
+.Pq IEEE 802.11 devices only
+Configure the RTS/CTS threshold for IEEE 802.11-based wireless
+network interfaces.
+This controls the number of bytes used for the RTS/CTS handshake boundary.
+The
+.Ar threshold
+can be any value between 0 and 2347.
+The default is 2347, which indicates the RTS/CTS mechanism should not be used.
.It Cm ssid Ar id
.Pq IEEE 802.11 devices only
Configure the Service Set Identifier (a.k.a. the network name)
Index: src/usr.sbin/wiconfig/wiconfig.8
diff -u src/usr.sbin/wiconfig/wiconfig.8:1.30 src/usr.sbin/wiconfig/wiconfig.8:1.31
--- src/usr.sbin/wiconfig/wiconfig.8:1.30 Wed Aug 25 18:48:54 2004
+++ src/usr.sbin/wiconfig/wiconfig.8 Thu Jul 2 17:45:26 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: wiconfig.8,v 1.30 2004/08/25 18:48:54 wiz Exp $
+.\" $NetBSD: wiconfig.8,v 1.31 2009/07/02 17:45:26 dyoung Exp $
.\"
.\" Copyright (c) 1997, 1998, 1999
.\" Bill Paul <wp...@ctr.columbia.edu> All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" From: wicontrol.8,v 1.6 1999/05/22 16:12:47 wpaul Exp $
.\"
-.Dd August 25, 2004
+.Dd July 2, 2009
.Dt WICONFIG 8
.Os
.Sh NAME
@@ -52,21 +52,12 @@
.Op Fl d Ar max_data_length
.Ek
.Bk -words
-.Op Fl g Ar fragmentation_threshold
-.Ek
-.Bk -words
.Op Fl M Ar 0|1
.Ek
.Bk -words
-.Op Fl m Ar MAC_address
-.Ek
-.Bk -words
.Op Fl R Ar 1|3
.Ek
.Bk -words
-.Op Fl r Ar RTS_threshold
-.Ek
-.Bk -words
.Op Fl s Ar station_name
.Ek
.Sh DESCRIPTION
@@ -133,8 +124,6 @@
.Ar max data length
can be any number from 256 to 2346.
The default is 2304.
-.It Fl g Ar fragmentation_threshold
-Set the fragmentation threshold.
.It Fl h
Display a short help.
.It Fl M Ar 0|1
@@ -145,8 +134,8 @@
.Pp
In cases of slow performance where there is a good quality signal but
also high levels of noise (i.e., the signal to noise ratio is bad but
-the signal strength is good), and there is an operating microwave oven
-in or near the signal path, this option may be of use.
+the signal strength is good), or a microwave oven is operating near the
+antenna of the WLAN peer or access point, this option may be of use.
.Pp
In bad signal-to-noise conditions, the link layer will switch to lower
transmit rates.
@@ -159,13 +148,6 @@
to be transmitted without error.
.Pp
Note that this does not impact the visible MTU of the link.
-.It Fl m Ar MAC_address
-Set the station address for the specified interface.
-The
-.Ar MAC address
-is specified as a series of six hexadecimal values separated by colons,
-e.g., 00:60:1d:12:34:56.
-This programs the new address into the card and updates the interface as well.
.It Fl o
Print out the statistics counters instead of the card settings.
Note that, however, the statistics will only be updated every minute or so.
@@ -178,12 +160,14 @@
(Roaming Disabled).
The default is 1.
.It Fl r Ar RTS_threshold
-Set the RTS/CTS threshold for a given interface.
-This controls the number of bytes used for the RTS/CTS handshake boundary.
-The
-.Ar RTS_threshold
-can be any value between 0 and 2347.
-The default is 2347, which indicates RTS/CTS mechanism never to be used.
+.It Fl f Ar fragmentation_threshold
+.It Fl m Ar MAC_address
+These options are deprecated since
+.Nx 6.0 .
+Use
+.Xr ifconfig 8
+to set the link-layer address, the fragmentation threshold, and the RTS
+threshold.
.It Fl s Ar station_name
Sets the
.Ar station_name
