Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5636f727 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[PATCH] dlink pci cards using wrong driver 



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: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent a145410d

drivers/net/skge.c

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ static const struct pci_device_id skge_id_table[] = { 
	{ 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, 0x4b01) },

	{ 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) },

drivers/net/sky2.c

+0 −2
Original line number Diff line number Diff line
@@ -99,8 +99,6 @@ MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)"); 
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) },