summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2007-02-10 23:19:35 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2007-02-10 23:19:35 +0000
commita2e222eed56844f48f90b3df7f7ffdcd1f187e05 (patch)
tree330b6a6cf8ecff080483be9240f9544768e8fcac
parent4f109c11ab5e867f0493e2cf735ca8a79c456a32 (diff)
Adjust for new/renamed DLink card & Marvell chips. Based on a diff by brad@.
-rw-r--r--sys/dev/pci/if_msk.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index 7f55fc9e9f9..15c32b958fc 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_msk.c,v 1.45 2007/02/10 22:49:46 kettenis Exp $ */
+/* $OpenBSD: if_msk.c,v 1.46 2007/02/10 23:19:34 kettenis Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -184,14 +184,18 @@ void msk_dump_bytes(const char *, int);
/* supported device vendors */
const struct pci_matchid mskc_devices[] = {
{ PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE550SX },
+ { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE550T_B1 },
{ PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE560SX },
{ PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE560T },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_1 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C032 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C033 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C034 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C036 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C042 },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8021CU },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8021X },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8022CU },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8022X },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8035 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8036 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8038 },
@@ -201,14 +205,13 @@ const struct pci_matchid mskc_devices[] = {
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8053 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8055 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8056 },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8021CU },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8021X },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8022CU },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8022X },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8061CU },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8061X },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8062CU },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8062X },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8058 },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8061CU },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8061X },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8062CU },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8062X },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8070 },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8071 },
{ PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Sxx },
{ PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Exx }
};