[kernel] r15921 - dists/sid/linux-2.6/debian/patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Thu Jul  1 11:32:59 2010
New Revision: 15921

Log:
Add upstream references for 3c59x patches

Modified:
   dists/sid/linux-2.6/debian/patches/bugfix/all/3c59x-Specify-window-for-access-to-windowed-regs.patch
   dists/sid/linux-2.6/debian/patches/bugfix/all/3c59x-Use-fine-grained-locks-for-MII-and-windowed-regs.patch

Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/3c59x-Specify-window-for-access-to-windowed-regs.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/3c59x-Specify-window-for-access-to-windowed-regs.patch	Thu Jul  1 04:15:21 2010	(r15920)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/3c59x-Specify-window-for-access-to-windowed-regs.patch	Thu Jul  1 11:32:59 2010	(r15921)
@@ -1,8 +1,9 @@
-From 9d21ef35e8ad9b51362533134518932a3a7b5f0e Mon Sep 17 00:00:00 2001
 From: Ben Hutchings <ben at decadent.org.uk>
 Date: Sun, 20 Jun 2010 21:09:01 +0100
 Subject: [PATCH 1/2] 3c59x: Specify window explicitly for access to windowed registers
 
+commit a095cfc40ec7ebe63e9532383c5b5c2a27b14075 upstream.
+
 Currently much of the code assumes that a specific window has been
 selected, while a few functions save and restore the window.  This
 makes it impossible to introduce fine-grained locking.
@@ -17,6 +18,8 @@
 unnecessary hardware writes.
 
 Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Tested-by: Arne Nordmark <nordmark at mech.kth.se> [against 2.6.32]
+Signed-off-by: David S. Miller <davem at davemloft.net>
 ---
  drivers/net/3c59x.c |  289 +++++++++++++++++++++++++--------------------------
  1 files changed, 140 insertions(+), 149 deletions(-)
@@ -699,6 +702,3 @@
  		/* The RxFilter must accept the WOL frames. */
  		iowrite16(SetRxFilter|RxStation|RxMulticast|RxBroadcast, ioaddr + EL3_CMD);
  		iowrite16(RxEnable, ioaddr + EL3_CMD);
--- 
-1.7.1
-

Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/3c59x-Use-fine-grained-locks-for-MII-and-windowed-regs.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/3c59x-Use-fine-grained-locks-for-MII-and-windowed-regs.patch	Thu Jul  1 04:15:21 2010	(r15920)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/3c59x-Use-fine-grained-locks-for-MII-and-windowed-regs.patch	Thu Jul  1 11:32:59 2010	(r15921)
@@ -1,10 +1,18 @@
-From a56874099ffeadcbd57cffeb2fd1d5d55c25ee03 Mon Sep 17 00:00:00 2001
 From: Ben Hutchings <ben at decadent.org.uk>
 Date: Sun, 20 Jun 2010 21:29:04 +0100
 Subject: [PATCH] 3c59x: Use fine-grained locks for MII and windowed register access
 
-This means that IRQs will only be deferred for relatively short
-periods of time.
+commit de847272149365363a6043a963a6f42fb91566e2 upstream.
+
+This avoids scheduling in atomic context and also means that IRQs
+will only be deferred for relatively short periods of time.
+    
+Previously discussed in:
+http://article.gmane.org/gmane.linux.network/155024
+    
+Reported-by: Arne Nordmark <nordmark at mech.kth.se>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
 ---
  drivers/net/3c59x.c |   69 ++++++++++++++++++++++++++++++--------------------
  1 files changed, 41 insertions(+), 28 deletions(-)
@@ -219,6 +227,3 @@
  }
  
  /* ACPI: Advanced Configuration and Power Interface. */
--- 
-1.7.1
-