| From 9e5490189520cc16dd0980bf95eba35cf4d4fc51 Mon Sep 17 00:00:00 2001 |
| From: Jeff Mahoney <jeffm@suse.com> |
| Date: Thu, 11 Feb 2010 10:26:38 +0000 |
| Subject: ipg: Remove device claimed by dl2k from pci id table |
| |
| From: Jeff Mahoney <jeffm@suse.com> |
| |
| commit 25cca5352712561fba97bd37c495593d641c1d39 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| drivers/net/ipg.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| --- 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 struct pci_device_id 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, } |
| }; |
| |
