From owner-svn-src-head@FreeBSD.ORG  Fri Apr 10 15:33:48 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1D5F9106566B;
	Fri, 10 Apr 2009 15:33:48 +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 0D36F8FC22;
	Fri, 10 Apr 2009 15:33:48 +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 n3AFXlxD052682;
	Fri, 10 Apr 2009 15:33:47 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3AFXlcg052681;
	Fri, 10 Apr 2009 15:33:47 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200904101533.n3AFXlcg052681@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 10 Apr 2009 15:33:47 +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: r190899 - head/sys/dev/ed
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2009 15:33:48 -0000

Author: imp
Date: Fri Apr 10 15:33:47 2009
New Revision: 190899
URL: http://svn.freebsd.org/changeset/base/190899

Log:
  The D-Link DE-650 isn't tagged as a network card, so allow it to
  attach anyway.
  Add a comment about a 'common' mfg/prod pair that's used in a very
  large array of different cards.

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	Fri Apr 10 15:30:19 2009	(r190898)
+++ head/sys/dev/ed/if_ed_pccard.c	Fri Apr 10 15:33:47 2009	(r190899)
@@ -165,7 +165,7 @@ static const struct ed_product {
 	{ PCMCIA_CARD(COREGA, LAPCCTXD), 0},
 	{ PCMCIA_CARD(DAYNA, COMMUNICARD_E_1), 0},
 	{ PCMCIA_CARD(DAYNA, COMMUNICARD_E_2), 0},
-	{ PCMCIA_CARD(DLINK, DE650), 0 },
+	{ PCMCIA_CARD(DLINK, DE650), NE2000DVF_ANYFUNC },
 	{ PCMCIA_CARD(DLINK, DE660), 0 },
 	{ PCMCIA_CARD(DLINK, DE660PLUS), 0},
 	{ PCMCIA_CARD(DYNALINK, L10C), 0},
@@ -182,6 +182,7 @@ static const struct ed_product {
 	{ PCMCIA_CARD(KINGSTON, CIO10T), 0},
 	{ PCMCIA_CARD(KINGSTON, KNE2), 0},
 	{ PCMCIA_CARD(LANTECH, FASTNETTX), NE2000DVF_AX88X90},
+	/* Same ID for many different cards, including generic NE2000 */
 	{ PCMCIA_CARD(LINKSYS, COMBO_ECARD),
 	    NE2000DVF_DL100XX | NE2000DVF_AX88X90},
 	{ PCMCIA_CARD(LINKSYS, ECARD_1), 0},