11 files changed, 36 insertions, 11 deletions

diff --git a/release/texts/HARDWARE.TXT b/release/texts/HARDWARE.TXT
index f063e278629d..cd633f89cdb2 100644
--- a/release/texts/HARDWARE.TXT
+++ b/release/texts/HARDWARE.TXT
@@ -577,4 +577,11 @@ Genius and Mustek hand scanners.
 
 Floppy tape drives (some rather old models only, driver rather stale)
 
+Lucent Technologies WaveLAN/IEEE 802.11 PCMCIA and ISA standard speed
+(2Mbps) and turbo speed (6Mbps) wireless network adapters and workalikes
+(NCR WaveLAN/IEEE 802.11, Cabletron RoamAbout 802.11 DS). Note: the
+ISA versions of these adapters are actually PCMCIA cards combined with
+an ISA to PCMCIA bridge card, so both kinds of devices work with
+the same driver.
+
 FreeBSD currently does NOT support IBM's microchannel (MCA) bus.
diff --git a/release/texts/RELNOTES.TXT b/release/texts/RELNOTES.TXT
index ee0ec50dff49..55eb677c2028 100644
--- a/release/texts/RELNOTES.TXT
+++ b/release/texts/RELNOTES.TXT
@@ -68,6 +68,10 @@ require that programs that use those two interfaces be recompiled.  Ports
 that use the CAM interface include xmcd, tosha, SANE, cdrecord and cdda2wav.
 Ports that use the devstat interface include xsysinfo and xperfmon.
 
+Added driver support for Lucent Technologies WaveLAN/IEEE and
+WaveLAN/IEEE Turbo 802.11 wireless networking adapters (PCMCIA
+and ISA versions) and workalikes (NCR WaveLAN/IEEE, Cabletron
+RoamAbout 802.11 DS).
 
 1.2. SECURITY FIXES
 -------------------
@@ -413,6 +417,13 @@ the HOT1 from Virtual Computers (www.vcc.com)
 
 Support for Dave Mills experimental Loran-C receiver.
 
+Lucent Technologies WaveLAN/IEEE 802.11 PCMCIA and ISA standard speed
+(2Mbps) and turbo speed (6Mbps) wireless network adapters and workalikes
+(NCR WaveLAN/IEEE 802.11, Cabletron RoamAbout 802.11 DS). Note: the
+ISA versions of these adapters are actually PCMCIA cards combined with
+an ISA to PCMCIA bridge card, so both kinds of devices work with
+the same driver.
+
 FreeBSD currently does NOT support IBM's microchannel (MCA) bus.
 
 3. Obtaining FreeBSD
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index a5175c5fd0dd..ce9162fff4bd 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.95.2.3 1999/04/10 06:29:24 obrien Exp $
+#	$Id: Makefile,v 1.95.2.4 1999/04/30 19:35:08 wpaul Exp $
 
 MAN4=	adv.4 adw.4 aha.4 ahb.4 ahc.4 aic.4 apm.4 ar.4 asc.4 atkbd.4 \
 	atkbdc.4 ax.4 bktr.4 bt.4 cs.4 cx.4 cy.4 de.4 \
@@ -8,7 +8,7 @@ MAN4=	adv.4 adw.4 aha.4 ahb.4 ahc.4 aic.4 apm.4 ar.4 asc.4 atkbd.4 \
 	pcf.4 pcm.4 pcvt.4 perfmon.4 pn.4 pnp.4 ppc.4 psm.4 \
 	rdp.4 rl.4 sb.4 scd.4 screen.4 si.4 sio.4 \
 	spkr.4 splash.4 sr.4 syscons.4 sysmouse.4 ti.4 tl.4 tw.4 tx.4 \
-	vga.4 vr.4 vx.4 wb.4 wd.4 wfd.4 wl.4 wt.4 xl.4 ze.4 zp.4
+	vga.4 vr.4 vx.4 wb.4 wd.4 wfd.4 wi.4 wl.4 wt.4 xl.4 ze.4 zp.4
 
 MLINKS=		adv.4 ../adv.4
 MLINKS+=	adw.4 ../adw.4
@@ -87,6 +87,7 @@ MLINKS+=	vx.4 ../vx.4
 MLINKS+=	wb.4 ../wb.4
 MLINKS+=	wd.4 ../wd.4
 MLINKS+=	wfd.4 ../wfd.4
+MLINKS+=	wi.4 ../wi.4
 MLINKS+=	wl.4 ../wl.4
 MLINKS+=	wt.4 ../wt.4
 MLINKS+=	xl.4 ../xl.4
diff --git a/share/man/man4/man4.i386/wi.4 b/share/man/man4/man4.i386/wi.4
index 5ef273abc722..618fd571e797 100644
--- a/share/man/man4/man4.i386/wi.4
+++ b/share/man/man4/man4.i386/wi.4
@@ -38,7 +38,7 @@
 .Nd
 Lucent Technologies WaveLAN/IEEE 802.11 PCMCIA driver
 .Sh SYNOPSIS
-.Cd "device wi0 at isa? port? irq?"
+.Cd "device wi0 at isa? port? net irq?"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index ea4d0014046a..af74f60b2311 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.539.2.20 1999/05/15 18:13:58 obrien Exp $
+#	$Id: LINT,v 1.539.2.21 1999/05/21 09:07:57 des Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1166,6 +1166,9 @@ options		"EXTRA_SIO=2"		#number of extra sio ports to allocate
 # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 & Am79C960)
 # rdp: RealTek RTL 8002-based pocket ethernet adapters
 # sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp)
+# wi: Lucent WaveLAN/IEEE 802.11 PCMCIA adapters. Note: this supports both
+#     the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA
+#     bridge with a PCMCIA adapter plugged into it.
 # wl: Lucent Wavelan (ISA card only).
 # ze: IBM/National Semiconductor PCMCIA ethernet controller.
 # zp: 3Com PCMCIA Etherlink III (It does not require shared memory for
@@ -1187,6 +1190,7 @@ device le0 at isa? port 0x300 net irq 5 iomem 0xd0000
 device lnc0 at isa? port 0x280 net irq 10 drq 0
 device rdp0 at isa? port 0x378 net irq 7 flags 2
 device sr0 at isa? port 0x300 net irq 5 iomem 0xd0000
+device wi0 at isa? port? net irq ?
 options		WLCACHE		# enables the signal-strength cache
 options		WLDEBUG		# enables verbose debugging output
 device wl0 at isa? port 0x300 net irq ?
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index c0b2d73c5345..db5ff19d19bd 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.220.2.4 1999/05/15 18:13:57 obrien Exp $
+#	$Id: files.i386,v 1.220.2.5 1999/05/21 08:37:08 des Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -144,6 +144,7 @@ i386/isa/if_le.c		optional	le	device-driver
 i386/isa/if_lnc.c		optional	lnc	device-driver
 i386/isa/if_rdp.c		optional	rdp	device-driver
 i386/isa/if_sr.c		optional	sr	device-driver
+i386/isa/if_wi.c		optional	wi	device-driver
 i386/isa/if_wl.c		optional	wl	device-driver
 dev/pccard/if_xe.c		optional	xe	device-driver
 i386/isa/if_ze.c		optional	ze	device-driver
diff --git a/sys/i386/include/if_wavelan_ieee.h b/sys/i386/include/if_wavelan_ieee.h
index f002933a9bdc..f42cbe286884 100644
--- a/sys/i386/include/if_wavelan_ieee.h
+++ b/sys/i386/include/if_wavelan_ieee.h
@@ -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: if_wavelan_ieee.h,v 1.4 1999/04/27 02:02:41 wpaul Exp $
+ *	$Id: if_wavelan_ieee.h,v 1.1 1999/05/05 07:36:50 wpaul Exp $
  */
 
 #ifndef _IF_WAVELAN_IEEE_H
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 97c9507b8526..b9e58bb874a6 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
-#	$Id: Makefile,v 1.147.2.3 1999/04/28 07:58:12 obrien Exp $
+#	$Id: Makefile,v 1.147.2.4 1999/05/10 19:44:24 obrien Exp $
 
 # XXX MISSING:		mkproto
 SUBDIR=	IPXrouted \
@@ -132,6 +132,7 @@ SUBDIR+=apm \
 	sicontrol \
 	spkrtest \
 	stallion \
+	wicontrol \
 	wlconfig
 .endif
 
diff --git a/usr.sbin/wicontrol/Makefile b/usr.sbin/wicontrol/Makefile
index 971f12cdfef6..73b4a5a7409f 100644
--- a/usr.sbin/wicontrol/Makefile
+++ b/usr.sbin/wicontrol/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1997/05/23 04:04:15 msmith Exp $
+#	$Id: Makefile,v 1.1 1999/05/05 07:37:06 wpaul Exp $
 PROG=	wicontrol
 SRCS=	wicontrol.c
 
diff --git a/usr.sbin/wicontrol/wicontrol.8 b/usr.sbin/wicontrol/wicontrol.8
index d0310d0accf3..8a7e76215d02 100644
--- a/usr.sbin/wicontrol/wicontrol.8
+++ b/usr.sbin/wicontrol/wicontrol.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\"	$Id: wicontrol.8,v 1.6 1999/05/22 16:12:47 wpaul Exp $
 .\"
 .Dd April 21, 1999
 .Dt WICONTROL 8
diff --git a/usr.sbin/wicontrol/wicontrol.c b/usr.sbin/wicontrol/wicontrol.c
index e22d3dae6e78..c68637291b83 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.19 1999/05/22 15:43:02 wpaul Exp $
+ *	$Id: wicontrol.c,v 1.6 1999/05/22 16:12:49 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.19 1999/05/22 15:43:02 wpaul Exp $";
+	"@(#) $Id: wicontrol.c,v 1.6 1999/05/22 16:12:49 wpaul Exp $";
 #endif
 
 static void wi_getval		__P((char *, struct wi_req *));