summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHakan Olsson <ho@cvs.openbsd.org>2000-07-02 12:51:39 +0000
committerHakan Olsson <ho@cvs.openbsd.org>2000-07-02 12:51:39 +0000
commit1f02dcdc9c05a66014cea2b3ee7ef83f42c75416 (patch)
tree40469b83dd8023e9e7f57598808d0fa91b9f14af
parentecccd2d4069aed53a7cb845a8ac40c6c92ca8730 (diff)
From onoe@netbsd.org:
Update the description of available channel for Japan. The regulations has been changed to adopt 802.11b since Oct. 99. For 11Mbps NICs sold in Japan, all DS channels (1..14) are available.
-rw-r--r--sbin/wicontrol/wicontrol.831
1 files changed, 16 insertions, 15 deletions
diff --git a/sbin/wicontrol/wicontrol.8 b/sbin/wicontrol/wicontrol.8
index 89d9083917d..46479448b6e 100644
--- a/sbin/wicontrol/wicontrol.8
+++ b/sbin/wicontrol/wicontrol.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wicontrol.8,v 1.12 2000/05/16 19:02:18 deraadt Exp $
+.\" $OpenBSD: wicontrol.8,v 1.13 2000/07/02 12:51:38 ho Exp $
.\"
.\" Copyright (c) 1997, 1998, 1999
.\" Bill Paul <wpaul@ctr.columbia.edu> All rights reserved.
@@ -234,19 +234,19 @@ Frequencies in the table are specified in Mhz.
.Bd -filled -offset indent
.Bl -column "Channel ID " "FCC " "ETSI " "France " "Japan "
.Em "Channel ID FCC ETSI France Japan"
-1 2412 2412 - -
-2 2417 2417 - -
-3 2422 2422 - -
-4 2427 2427 - -
-5 2432 2432 - -
-6 2437 2437 - -
-7 2442 2442 - -
-8 2447 2447 - -
-9 2452 2452 - -
-10 2457 2457 2457 -
-11 2462 2462 2462 -
-12 - 2467 2467 -
-13 - 2472 2472 -
+1 2412 2412 - 2412
+2 2417 2417 - 2417
+3 2422 2422 - 2422
+4 2427 2427 - 2427
+5 2432 2432 - 2432
+6 2437 2437 - 2437
+7 2442 2442 - 2442
+8 2447 2447 - 2447
+9 2452 2452 - 2452
+10 2457 2457 2457 2457
+11 2462 2462 2462 2462
+12 - 2467 2467 2467
+13 - 2472 2472 2472
14 - - - 2484
.El
.Ed
@@ -255,7 +255,8 @@ If an illegal channel is specified, the
NIC will revert to its default channel.
For NICs sold in the United States and Europe, the default channel is 3.
For NICs sold in France, the default channel is 11.
-For NICs sold in Japan, the only available channel is 14.
+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 P Ar 0|1