[src/trunk]: src Change wi(4)'s default from ad-hoc mode to BSS mode. Also

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

details:   https://anonhg.NetBSD.org/src/rev/3c9ddd9430b1
branches:  trunk
changeset: 502098:3c9ddd9430b1
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Thu Jan 11 19:33:51 2001 +0000

description:
Change wi(4)'s default from ad-hoc mode to BSS mode. Also
some minor manpage fixes.

diffstat:

 share/man/man4/wi.4          |  23 ++++++++++++-----------
 sys/dev/pcmcia/if_wi.c       |   4 ++--
 usr.sbin/wiconfig/wiconfig.8 |   8 ++++----
 3 files changed, 18 insertions(+), 17 deletions(-)

diffs (115 lines):

diff -r 53c1ed74ec3d -r 3c9ddd9430b1 share/man/man4/wi.4
--- a/share/man/man4/wi.4       Thu Jan 11 18:44:29 2001 +0000
+++ b/share/man/man4/wi.4       Thu Jan 11 19:33:51 2001 +0000
@@ -1,4 +1,4 @@
-.\"     $NetBSD: wi.4,v 1.13 2000/11/12 20:47:44 hubertf Exp $
+.\"     $NetBSD: wi.4,v 1.14 2001/01/11 19:33:51 jhawk Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"    Bill Paul <wpaul%ctr.columbia.edu@localhost>. 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.
 .\"
-.\"    $Id: wi.4,v 1.13 2000/11/12 20:47:44 hubertf Exp $
+.\"    $Id: wi.4,v 1.14 2001/01/11 19:33:51 jhawk Exp $
 .\"
-.Dd November 12, 2000
+.Dd January 11, 2001
 .Dt WI 4 
 .Os 
 .Sh NAME
@@ -75,19 +75,19 @@
 For WaveLAN/IEEE Turbo 11Mbps adapters and PRISM-II adapters, speeds up to
 11Mbps are available.
 .Pp
-By default, the
+The
 .Nm
-driver configures the WaveLAN card for special ad-hoc operation.
+driver supports configuration of 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
+Note that this mode is not in the IEEE 802.11 specification and the driver
+may interoperate with other cards. This mode is no longer the default
+and must be selected using the
 .Xr ifconfig 8
 or
 .Xr wiconfig 8
-utility.
+utilities.
 .Pp
 For more information on configuring this device, see
 .Xr ifconfig 8
@@ -98,7 +98,7 @@
 .Nm
 driver include:
 .Pp
-.Bl -item -offset indent
+.Bl -item -offset indent -compact
 .It
 Lucent Wavelan/IEEE 2.0Mb Bronze
 .It
@@ -142,9 +142,10 @@
 .El
 .Sh BUGS
 The IBSS mode is not supported.
+.Pp
 The execution of
 .Xr wiconfig 8
-during the interface is down produces some error messages.
+while the interface is down can produce some error messages.
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr ifmedia 4 ,
diff -r 53c1ed74ec3d -r 3c9ddd9430b1 sys/dev/pcmcia/if_wi.c
--- a/sys/dev/pcmcia/if_wi.c    Thu Jan 11 18:44:29 2001 +0000
+++ b/sys/dev/pcmcia/if_wi.c    Thu Jan 11 19:33:51 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wi.c,v 1.49 2001/01/11 11:37:54 ichiro Exp $        */
+/*     $NetBSD: if_wi.c,v 1.50 2001/01/11 19:33:51 jhawk Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -420,7 +420,7 @@
            sizeof(WI_DEFAULT_IBSS) - 1);
 
        sc->wi_portnum = WI_DEFAULT_PORT;
-       sc->wi_ptype = WI_PORTTYPE_ADHOC;
+       sc->wi_ptype = WI_PORTTYPE_BSS;
        sc->wi_ap_density = WI_DEFAULT_AP_DENSITY;
        sc->wi_rts_thresh = WI_DEFAULT_RTS_THRESH;
        sc->wi_tx_rate = WI_DEFAULT_TX_RATE;
diff -r 53c1ed74ec3d -r 3c9ddd9430b1 usr.sbin/wiconfig/wiconfig.8
--- a/usr.sbin/wiconfig/wiconfig.8      Thu Jan 11 18:44:29 2001 +0000
+++ b/usr.sbin/wiconfig/wiconfig.8      Thu Jan 11 19:33:51 2001 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: wiconfig.8,v 1.12 2000/11/07 05:47:33 lukem Exp $
+.\"    $NetBSD: wiconfig.8,v 1.13 2001/01/11 19:33:51 jhawk Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"    Bill Paul <wpaul%ctr.columbia.edu@localhost> All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"    From: wicontrol.8,v 1.6 1999/05/22 16:12:47 wpaul Exp $
 .\"
-.Dd August 18, 2000
+.Dd January 11, 2001
 .Dt WICONFIG 8
 .Os
 .Sh NAME
@@ -220,8 +220,8 @@
 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).
+which relays traffic between end stations. The default setting is 1
+(BSS mode).
 .It Fl a Ar access_point_density
 Specify the
 .Ar access point density