Stephen Hemminger wrote:
This patch fixes the problem of some Dlink cards picking the wrong
driver. It looks like these cards use Yukon 1 chipset, not Yukon 2.
Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
--- sky2-2.6.17.orig/drivers/net/skge.c 2006-03-24 09:56:05.000000000 -0800
+++ sky2-2.6.17/drivers/net/skge.c 2006-04-10 13:26:46.000000000 -0700
@@ -78,6 +78,8 @@
{ PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_GE) },
{ PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_YU) },
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, PCI_DEVICE_ID_DLINK_DGE510T), },
+ { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b00) },
+ { PCI_DEVICE(PCI_VENDOR_ID_DLINK, PCI_DEVICE_ID_DLINK_DGE530T) },
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4320) },
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5005) }, /* Belkin */
{ PCI_DEVICE(PCI_VENDOR_ID_CNET, PCI_DEVICE_ID_CNET_GIGACARD) },
--- sky2-2.6.17.orig/drivers/net/sky2.c 2006-04-10 13:08:39.000000000 -0700
+++ sky2-2.6.17/drivers/net/sky2.c 2006-04-10 13:25:03.000000000 -0700
@@ -99,8 +99,6 @@
static const struct pci_device_id sky2_id_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) },
{ PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) },
- { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b00) },
- { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b01) },
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4340) },
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4341) },
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4342) },
--- sky2-2.6.17.orig/include/linux/pci_ids.h 2006-04-03 09:21:05.000000000
-0700
+++ sky2-2.6.17/include/linux/pci_ids.h 2006-04-10 13:26:22.000000000 -0700
@@ -1410,6 +1410,7 @@
#define PCI_VENDOR_ID_DLINK 0x1186
#define PCI_DEVICE_ID_DLINK_DGE510T 0x4c00
+#define PCI_DEVICE_ID_DLINK_DGE530T 0x4b01
For the future, let's avoid adding device ids to pci_ids.h.
Your existing code already does the right thing -- PCI_VENDOR_ID_xxx for
vendors, and a hex constant for device ids.
Rationale: PCI_VENDOR_ID_xxx constants are re-used, but device ids are
not. Further, device ids are arbitrary hex numbers, normally used only
in a single location, the pci_device_id table.
Jeff
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
