Add a third possible vendor code for the D-Link DFE670-TXD. While there,

make the `unmatched vendor code' error message slightly more verbose to
make things easier next time this kind of issue arises.

Reported and tested by Pierre-Philipp Braun.
This commit is contained in:
cube 2004-04-25 12:20:54 +00:00
parent fdab6cb011
commit d902fa87b0
1 changed files with 13 additions and 2 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ne_pcmcia.c,v 1.110 2004/03/13 15:09:16 cube Exp $ */
/* $NetBSD: if_ne_pcmcia.c,v 1.111 2004/04/25 12:20:54 cube Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.110 2004/03/13 15:09:16 cube Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.111 2004/04/25 12:20:54 cube Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -292,6 +292,9 @@ static const struct ne2000dev {
* There are two entries for the DFE-670TXD because there are
* several possible Vendor IDs for the MAC address. Both are
* from D-Link, though.
*
* Oh, wait, there's a third possible vendor code, apparently.
* And it's from "ANI Communications" this time...
*/
{ PCMCIA_STR_DLINK_DFE670TXD,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_NETGEAR_FA410TXC,
@ -303,6 +306,11 @@ static const struct ne2000dev {
PCMCIA_CIS_DLINK_DFE670TXD,
0, -1, { 0x00, 0x0d, 0x88 }, NE2000DVF_DL10019 },
{ PCMCIA_STR_DLINK_DFE670TXD,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_NETGEAR_FA410TXC,
PCMCIA_CIS_DLINK_DFE670TXD,
0, -1, { 0x00, 0x40, 0x05 }, NE2000DVF_DL10019 },
{ PCMCIA_STR_MELCO_LPC2_TX,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ETHERFAST,
PCMCIA_CIS_MELCO_LPC2_TX,
@ -777,6 +785,9 @@ again:
dsc->sc_dev.dv_xname,
pa->manufacturer, pa->product,
pa->card->cis1_info[0], pa->card->cis1_info[1]);
if (enaddr != NULL)
aprint_error("%s: ethernet vendor code %02x:%02x:%02x\n",
enaddr[0], enaddr[1], enaddr[2]);
goto fail_5;
found: