8 files changed, 39 insertions, 13 deletions

diff --git a/release/texts/HARDWARE.TXT b/release/texts/HARDWARE.TXT
index d4db9e75ce19d..33f27da079073 100644
--- a/release/texts/HARDWARE.TXT
+++ b/release/texts/HARDWARE.TXT
@@ -462,6 +462,9 @@ Macronix 98713, 98713A, 98715, 98715A and 98725 fast ethernet NICs
   CNet Pro120B (98715)
   SVEC PN102TX (98713)
 
+Macronix/Lite-On PNIC II LC82C115 fast ethernet NICs including the following:
+  LinkSys EtherFast LNE100TX Version 2
+
 Winbond W89C840F fast ethernet NICs including the following:
   Trendware TE100-PCIE
 
diff --git a/release/texts/RELNOTES.TXT b/release/texts/RELNOTES.TXT
index 52ce304801c9f..dc99f4d6aadc4 100644
--- a/release/texts/RELNOTES.TXT
+++ b/release/texts/RELNOTES.TXT
@@ -256,6 +256,9 @@ Macronix 98713, 98713A, 98715, 98715A and 98725 fast ethernet NICs
   CNet Pro120B (98715)
   SVEC PN102TX (98713)
 
+Macronix/Lite-On PNIC II LC82C115 fast ethernet NICs including the following:
+  LinkSys EtherFast LNE100TX Version 2
+
 Winbond W89C840F fast ethernet NICs including the following:
   Trendware TE100-PCIE
 
diff --git a/share/man/man4/man4.i386/mx.4 b/share/man/man4/man4.i386/mx.4
index 189f4f36df645..462252df8bfa8 100644
--- a/share/man/man4/man4.i386/mx.4
+++ b/share/man/man4/man4.i386/mx.4
@@ -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: mx.4,v 1.2 1998/12/05 09:31:25 rnordier Exp $
+.\"	$Id: mx.4,v 1.3 1999/03/25 00:52:44 wpaul Exp $
 .\"
 .Dd November 5, 1998
 .Dt MX 4 i386
@@ -46,7 +46,12 @@ driver provides support for PCI ethernet adapters and embedded
 controllers based on the Macronix 98713, 98713A, 98715, 98715A and
 98725 fast ethernet controller chips. This includes the NDC
 Communications SOHOware SFA110, the SVEC PN102-TX
-fast ethernet card, and various other adapters.
+fast ethernet card, and various other adapters. The
+.Nm
+driver also supports the Lite-On 82c115 PNIC II chip, which is
+actually similar in design to the Macronix 98715A with the addition
+of wake on LAN support. Supported PNIC II cards include the
+LinkSys LNE100TX Version 2.
 .Pp
 The Macronix chips use bus master DMA and are designed to be
 DEC 'tulip' workalikes. The original 98713 had an MII bus for
diff --git a/share/man/man4/mx.4 b/share/man/man4/mx.4
index 189f4f36df645..462252df8bfa8 100644
--- a/share/man/man4/mx.4
+++ b/share/man/man4/mx.4
@@ -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: mx.4,v 1.2 1998/12/05 09:31:25 rnordier Exp $
+.\"	$Id: mx.4,v 1.3 1999/03/25 00:52:44 wpaul Exp $
 .\"
 .Dd November 5, 1998
 .Dt MX 4 i386
@@ -46,7 +46,12 @@ driver provides support for PCI ethernet adapters and embedded
 controllers based on the Macronix 98713, 98713A, 98715, 98715A and
 98725 fast ethernet controller chips. This includes the NDC
 Communications SOHOware SFA110, the SVEC PN102-TX
-fast ethernet card, and various other adapters.
+fast ethernet card, and various other adapters. The
+.Nm
+driver also supports the Lite-On 82c115 PNIC II chip, which is
+actually similar in design to the Macronix 98715A with the addition
+of wake on LAN support. Supported PNIC II cards include the
+LinkSys LNE100TX Version 2.
 .Pp
 The Macronix chips use bus master DMA and are designed to be
 DEC 'tulip' workalikes. The original 98713 had an MII bus for
diff --git a/sys/pci/if_mx.c b/sys/pci/if_mx.c
index bbed820560602..bb2f843d29396 100644
--- a/sys/pci/if_mx.c
+++ b/sys/pci/if_mx.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: if_mx.c,v 1.16 1999/05/06 15:32:45 wpaul Exp $
+ *	$Id: if_mx.c,v 1.17 1999/05/09 17:06:56 peter Exp $
  */
 
 /*
@@ -94,7 +94,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_mx.c,v 1.16 1999/05/06 15:32:45 wpaul Exp $";
+	"$Id: if_mx.c,v 1.17 1999/05/09 17:06:56 peter Exp $";
 #endif
 
 /*
@@ -113,6 +113,8 @@ static struct mx_type mx_devs[] = {
 		"Macronix 98715/98715A 10/100BaseTX" },
 	{ MX_VENDORID, MX_DEVICEID_987x5,
 		"Macronix 98725 10/100BaseTX" },
+	{ PN_VENDORID, PN_DEVICEID_PNIC_II,
+		"LC82C115 PNIC II 10/100BaseTX" },
 	{ 0, 0, NULL }
 };
 
diff --git a/sys/pci/if_mxreg.h b/sys/pci/if_mxreg.h
index 28e757c1a7b79..69721ad185057 100644
--- a/sys/pci/if_mxreg.h
+++ b/sys/pci/if_mxreg.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_mxreg.h,v 1.5 1999/05/06 15:32:46 wpaul Exp $
+ *	$Id: if_mxreg.h,v 1.6 1999/05/26 23:01:48 gallatin Exp $
  */
 
 /*
@@ -539,6 +539,17 @@ struct mx_softc {
 #define CP_DEVICEID_98713	0x9881
 
 /*
+ * Lite-On PNIC PCI vendor ID
+ */
+#define PN_VENDORID		0x11AD
+ 
+/* 
+ * Lite-On PNIC II device ID. Note: this is actually a Macronix 98715A
+ * with wake on lan/magic packet support.
+ */
+#define PN_DEVICEID_PNIC_II	0xc115
+
+/*
  * Texas Instruments PHY identifiers
  */
 #define TI_PHY_VENDORID		0x4000
diff --git a/sys/pci/if_pn.c b/sys/pci/if_pn.c
index 1dea3206e8104..9b1c5800cbb2a 100644
--- a/sys/pci/if_pn.c
+++ b/sys/pci/if_pn.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: if_pn.c,v 1.19 1999/05/09 17:06:57 peter Exp $
+ *	$Id: if_pn.c,v 1.20 1999/05/26 23:08:04 gallatin Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_pn.c,v 1.19 1999/05/09 17:06:57 peter Exp $";
+	"$Id: if_pn.c,v 1.20 1999/05/26 23:08:04 gallatin Exp $";
 #endif
 
 
@@ -109,8 +109,6 @@ static struct pn_type pn_devs[] = {
 		"82c168 PNIC 10/100BaseTX" },
 	{ PN_VENDORID, PN_DEVICEID_PNIC,
 		"82c169 PNIC 10/100BaseTX" },
-	{ PN_VENDORID, PN_DEVICEID_PNIC_II,
-		"82c115 PNIC II 10/100BaseTX" },
 	{ 0, 0, NULL }
 };
 
diff --git a/sys/pci/if_pnreg.h b/sys/pci/if_pnreg.h
index 8bf3f5822f567..64a625be86abd 100644
--- a/sys/pci/if_pnreg.h
+++ b/sys/pci/if_pnreg.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_pnreg.h,v 1.11 1999/05/06 15:32:47 wpaul Exp $
+ *	$Id: if_pnreg.h,v 1.12 1999/05/26 23:01:49 gallatin Exp $
  */
 
 /*
@@ -525,7 +525,6 @@ struct pn_softc {
  * Lite-On PNIC PCI device ID.
  */
 #define	PN_DEVICEID_PNIC	0x0002
-#define PN_DEVICEID_PNIC_II	0xc115
 
 /*
  * The 82c168 chip has the same PCI vendor/device ID as the