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

[Ben Hutchings]

Author: benh
Date: Sat Apr 17 14:46:31 2010
New Revision: 15517

Log:
forcedeth: Fix hardware version check for TX bug workaround (Closes: #572201)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/forcedeth-fix-tx-limit2-flag-check.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/12

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Apr 17 14:38:09 2010	(r15516)
+++ dists/sid/linux-2.6/debian/changelog	Sat Apr 17 14:46:31 2010	(r15517)
@@ -18,6 +18,8 @@
       support the output format we need (Closes: #576608)
   * i915: Stop trying to use ACPI lid status to determine LVDS connection
     (Closes: #577724)
+  * forcedeth: Fix hardware version check for TX bug workaround
+    (Closes: #572201)
 
   [ maximilian attems]
   * Ignore ABI breakage due to libata switch.

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/forcedeth-fix-tx-limit2-flag-check.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/forcedeth-fix-tx-limit2-flag-check.patch	Sat Apr 17 14:46:31 2010	(r15517)
@@ -0,0 +1,35 @@
+From 5c659322a904a7cc0265e7b183372b9bdebec6db Mon Sep 17 00:00:00 2001
+From: Ayaz Abdulla <aabdulla at nvidia.com>
+Date: Tue, 13 Apr 2010 18:49:51 -0700
+Subject: [PATCH] forcedeth: fix tx limit2 flag check
+
+This is a fix for bug 572201 @ bugs.debian.org
+
+This patch fixes the TX_LIMIT feature flag. The previous logic check
+for TX_LIMIT2 also took into account a device that only had TX_LIMIT
+set.
+
+Reported-by: Stephen Mulcahu <stephen.mulcahy at deri.org>
+Reported-by: Ben Huchings <ben at decadent.org.uk>
+Signed-off-by: Ayaz Abdulla <aabdulla at nvidia.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/forcedeth.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
+index 73b260c..5c98f7c 100644
+--- a/drivers/net/forcedeth.c
++++ b/drivers/net/forcedeth.c
+@@ -5899,7 +5899,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
+ 	/* Limit the number of tx's outstanding for hw bug */
+ 	if (id->driver_data & DEV_NEED_TX_LIMIT) {
+ 		np->tx_limit = 1;
+-		if ((id->driver_data & DEV_NEED_TX_LIMIT2) &&
++		if (((id->driver_data & DEV_NEED_TX_LIMIT2) == DEV_NEED_TX_LIMIT2) &&
+ 		    pci_dev->revision >= 0xA2)
+ 			np->tx_limit = 0;
+ 	}
+-- 
+1.7.0.3
+

Modified: dists/sid/linux-2.6/debian/patches/series/12
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/12	Sat Apr 17 14:38:09 2010	(r15516)
+++ dists/sid/linux-2.6/debian/patches/series/12	Sat Apr 17 14:46:31 2010	(r15517)
@@ -5,3 +5,4 @@
 + bugfix/all/ACPI-EC-Allow-multibyte-access-to-EC.patch
 + features/arm/dns323-rev-a1-gpio-request.patch
 + bugfix/all/drm-i915-Stop-trying-to-use-ACPI-lid-status-to-deter.patch
++ bugfix/all/forcedeth-fix-tx-limit2-flag-check.patch