[kernel] r16397 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun Oct  3 22:07:35 2010
New Revision: 16397

Log:
ipg: Remove device claimed by dl2k from pci id table (Closes: #599021)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/ipg-Remove-device-claimed-by-dl2k-from-pci-id-table.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/25

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Oct  3 20:18:31 2010	(r16396)
+++ dists/sid/linux-2.6/debian/changelog	Sun Oct  3 22:07:35 2010	(r16397)
@@ -3,6 +3,7 @@
   [ Ben Hutchings ]
   * mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y
   * Add stable 2.6.32.24 (trivial fix, already applied)
+  * ipg: Remove device claimed by dl2k from pci id table (Closes: #599021)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 30 Sep 2010 12:28:58 +0100
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/ipg-Remove-device-claimed-by-dl2k-from-pci-id-table.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ipg-Remove-device-claimed-by-dl2k-from-pci-id-table.patch	Sun Oct  3 22:07:35 2010	(r16397)
@@ -0,0 +1,47 @@
+From: Jeff Mahoney <jeffm at suse.com>
+Date: Thu, 11 Feb 2010 10:26:38 +0000
+Subject: [PATCH] ipg: Remove device claimed by dl2k from pci id table
+
+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 at suse.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/ipg.c |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
+index dbdebd5..3ca49e3 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, }
+ };
+ 
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/25
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/25	Sun Oct  3 20:18:31 2010	(r16396)
+++ dists/sid/linux-2.6/debian/patches/series/25	Sun Oct  3 22:07:35 2010	(r16397)
@@ -1,3 +1,4 @@
 + bugfix/all/mmc-build-fix-mmc_pm_notify.patch
 - bugfix/all/xen-Fix-typo-in-xen_percpu_chip-definition.patch
 + bugfix/all/stable/2.6.32.24.patch
++ bugfix/all/ipg-Remove-device-claimed-by-dl2k-from-pci-id-table.patch