From owner-svn-src-all@FreeBSD.ORG  Wed Apr 30 05:00:53 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4DD39701;
 Wed, 30 Apr 2014 05:00:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3A5781B40;
 Wed, 30 Apr 2014 05:00:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3U50rRp041642;
 Wed, 30 Apr 2014 05:00:53 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3U50r0Y041641;
 Wed, 30 Apr 2014 05:00:53 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201404300500.s3U50r0Y041641@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Wed, 30 Apr 2014 05:00:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-other@freebsd.org
Subject: svn commit: r265128 - stable/4/sys/i386/isa
X-SVN-Group: stable-other
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Apr 2014 05:00:53 -0000

Author: dteske
Date: Wed Apr 30 05:00:52 2014
New Revision: 265128
URL: http://svnweb.freebsd.org/changeset/base/265128

Log:
  Fix lnc0 detection in VMware when PXE booting.
  This is a direct commit to stable/4 since lnc(4) was deprecated
  and does not exist beyond this branch.
  
  Submitted by:	Paul Meng <mirnshi@163.com>
  PR:		kern/77982

Modified:
  stable/4/sys/i386/isa/if_lnc.c

Modified: stable/4/sys/i386/isa/if_lnc.c
==============================================================================
--- stable/4/sys/i386/isa/if_lnc.c	Wed Apr 30 04:44:51 2014	(r265127)
+++ stable/4/sys/i386/isa/if_lnc.c	Wed Apr 30 05:00:52 2014	(r265128)
@@ -114,6 +114,7 @@ struct lnc_softc {
 	int rap;
 	int rdp;
 	int bdp;
+	int reset;
 #ifdef DEBUG
 	int lnc_debug;
 #endif
@@ -1120,6 +1121,7 @@ pcnet_probe(struct lnc_softc *sc)
 {
 	u_long chip_id;
 	int type;
+	int reset_val;
 
 	/*
 	 * The PCnet family don't reset the RAP register on reset so we'll
@@ -1127,6 +1129,8 @@ pcnet_probe(struct lnc_softc *sc)
 	 * though so the probe is just a matter of reading it.
 	 */
 
+	reset_val = inw(sc->reset);
+	outw(reset_val, sc->reset);
 	if ((type = lance_probe(sc))) {
 		chip_id = read_csr(sc, CSR89);
 		chip_id <<= 16;
@@ -1293,6 +1297,7 @@ lnc_attach_ne2100_pci(int unit, unsigned
 		sc->rap = iobase + PCNET_RAP;
 		sc->rdp = iobase + PCNET_RDP;
 		sc->bdp = iobase + PCNET_BDP;
+		sc->reset = iobase + PCNET_RESET;
 
 		sc->nic.ic = pcnet_probe(sc);
 		if (sc->nic.ic >= PCnet_32) {