From owner-svn-src-all@FreeBSD.ORG  Sat Apr 18 04:37:54 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8D00F106566B;
	Sat, 18 Apr 2009 04:37:54 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7C7078FC0A;
	Sat, 18 Apr 2009 04:37:54 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3I4bs41055176;
	Sat, 18 Apr 2009 04:37:54 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3I4bsOv055175;
	Sat, 18 Apr 2009 04:37:54 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200904180437.n3I4bsOv055175@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 18 Apr 2009 04:37:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191237 - head/sys/dev/ed
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 18 Apr 2009 04:37:55 -0000

Author: imp
Date: Sat Apr 18 04:37:53 2009
New Revision: 191237
URL: http://svn.freebsd.org/changeset/base/191237

Log:
  Add GVP NIC 2000P and New Media Livewire.  Also New Media LanSurfer
  doesn't have a function type of network, so add a quirk for that...

Modified:
  head/sys/dev/ed/if_ed_pccard.c

Modified: head/sys/dev/ed/if_ed_pccard.c
==============================================================================
--- head/sys/dev/ed/if_ed_pccard.c	Sat Apr 18 04:21:04 2009	(r191236)
+++ head/sys/dev/ed/if_ed_pccard.c	Sat Apr 18 04:37:53 2009	(r191237)
@@ -176,6 +176,7 @@ static const struct ed_product {
 	{ PCMCIA_CARD(GREY_CELL, TDK3000), 0},
 	{ PCMCIA_CARD(GREY_CELL, DMF650TX),
 	    NE2000DVF_ANYFUNC | NE2000DVF_DL100XX | NE2000DVF_MODEM},
+	{ PCMCIA_CARD(GVC, NIC_2000P), 0},
 	{ PCMCIA_CARD(IBM, HOME_AND_AWAY), 0},
 	{ PCMCIA_CARD(IBM, INFOMOVER), 0},
 	{ PCMCIA_CARD(IODATA3, PCLAT), 0},
@@ -200,7 +201,8 @@ static const struct ed_product {
 	/* Same ID as DLINK DFE-670TXD.  670 has DL10022, fa411 has ax88790 */
 	{ PCMCIA_CARD(NETGEAR, FA411), NE2000DVF_AX88X90 | NE2000DVF_DL100XX},
 	{ PCMCIA_CARD(NEXTCOM, NEXTHAWK), 0},
-	{ PCMCIA_CARD(NEWMEDIA, LANSURFER), 0},
+	{ PCMCIA_CARD(NEWMEDIA, LANSURFER), NE2000DVF_ANYFUNC},
+	{ PCMCIA_CARD(NEWMEDIA, LIVEWIRE), 0},
 	{ PCMCIA_CARD(OEM2, ETHERNET), 0},
 	{ PCMCIA_CARD(OEM2, FAST_ETHERNET), NE2000DVF_AX88X90 },
 	{ PCMCIA_CARD(OEM2, NE2000), 0},