summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2010-02-11 10:26:38 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-17 15:59:38 -0800
commit25cca5352712561fba97bd37c495593d641c1d39 (patch)
treee31319edcccd30914e7268917ab8689df34eddc5 /drivers
parent069c474e88bb7753183f1eadbd7786c27888c8e3 (diff)
downloadlinux-stable-25cca5352712561fba97bd37c495593d641c1d39.tar.gz
linux-stable-25cca5352712561fba97bd37c495593d641c1d39.tar.bz2
linux-stable-25cca5352712561fba97bd37c495593d641c1d39.zip
ipg: Remove device claimed by dl2k from pci id table
This patch removes D-Link DGE-550T PCI ID (1186:4000) from the ipg driver. The ipg driver is for IP2000-based cards and the DGE-550T is a DL2000-based card. The driver loads and works for a few moments, but once a real workload is applied it stops operating. The ipg driver claimed this ID since it was introduced in 2.6.24 and it's forced many users to blacklist it. The correct driver for this hardware is the dl2k driver, which has been claiming this PCI ID since the 2.4 days. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ipg.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index dbdebd5efe86..3ca49e348c9d 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -88,7 +88,6 @@ static const char *ipg_brand_name[] = {
"Sundance Technology ST2021 based NIC",
"Tamarack Microelectronics TC9020/9021 based NIC",
"Tamarack Microelectronics TC9020/9021 based NIC",
- "D-Link NIC",
"D-Link NIC IP1000A"
};
@@ -97,8 +96,7 @@ static DEFINE_PCI_DEVICE_TABLE(ipg_pci_tbl) = {
{ PCI_VDEVICE(SUNDANCE, 0x2021), 1 },
{ PCI_VDEVICE(SUNDANCE, 0x1021), 2 },
{ PCI_VDEVICE(DLINK, 0x9021), 3 },
- { PCI_VDEVICE(DLINK, 0x4000), 4 },
- { PCI_VDEVICE(DLINK, 0x4020), 5 },
+ { PCI_VDEVICE(DLINK, 0x4020), 4 },
{ 0, }
};