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

[Ben Hutchings]

Author: benh
Date: Wed Mar 23 04:25:44 2011
New Revision: 17103

Log:
r8169: Fix up backport of "r8169: keep firmware in memory." (Closes: #619173)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/r8169-Fix-up-backport-of-r8169-keep-firmware-in-memo.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/32

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Wed Mar 23 03:45:00 2011	(r17102)
+++ dists/squeeze/linux-2.6/debian/changelog	Wed Mar 23 04:25:44 2011	(r17103)
@@ -20,6 +20,8 @@
   * scsi: Re-enable SCSI_PROC_FS (/proc/scsi directory) (Closes: #618258)
   * [vserver] Complete fix for CVE-2010-4243 (Closes: #618485)
   * [x86] quirk: Fix SB600 revision check (regression in 2.6.32.30)
+  * r8169: Fix up backport of "r8169: keep firmware in memory."
+    (Closes: #619173)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 12 Mar 2011 20:20:58 +0000
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/r8169-Fix-up-backport-of-r8169-keep-firmware-in-memo.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/r8169-Fix-up-backport-of-r8169-keep-firmware-in-memo.patch	Wed Mar 23 04:25:44 2011	(r17103)
@@ -0,0 +1,35 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Wed, 23 Mar 2011 03:53:50 +0000
+Subject: [PATCH] r8169: Fix up backport of "r8169: keep firmware in memory."
+
+In 2.6.32, the first parameter of mdio_read() in r8169 is the device
+MMIO address, not the address of the driver context.
+---
+ drivers/net/r8169.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
+index 350880f..1cbf195 100644
+--- a/drivers/net/r8169.c
++++ b/drivers/net/r8169.c
+@@ -1907,7 +1907,7 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp)
+ 
+ 	mdio_write(ioaddr, 0x1f, 0x0005);
+ 	mdio_write(ioaddr, 0x05, 0x001b);
+-	if ((mdio_read(tp, 0x06) != 0xbf00) ||
++	if ((mdio_read(ioaddr, 0x06) != 0xbf00) ||
+ 	    (rtl_apply_firmware(tp, FIRMWARE_8168D_1) < 0)) {
+ 		if (netif_msg_probe(tp))
+ 			printk(KERN_WARNING "%s: unable to apply firmware patch\n",
+@@ -2014,7 +2014,7 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp)
+ 
+ 	mdio_write(ioaddr, 0x1f, 0x0005);
+ 	mdio_write(ioaddr, 0x05, 0x001b);
+-	if ((mdio_read(tp, 0x06) != 0xb300) ||
++	if ((mdio_read(ioaddr, 0x06) != 0xb300) ||
+ 	    (rtl_apply_firmware(tp, FIRMWARE_8168D_2) < 0)) {
+ 		if (netif_msg_probe(tp))
+ 			printk(KERN_WARNING "%s: unable to apply firmware patch\n",
+-- 
+1.7.4.1
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/32
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/32	Wed Mar 23 03:45:00 2011	(r17102)
+++ dists/squeeze/linux-2.6/debian/patches/series/32	Wed Mar 23 04:25:44 2011	(r17103)
@@ -4,3 +4,4 @@
 + bugfix/all/stable/2.6.32.33.patch
 - bugfix/x86/drm-i915-add-pipe-A-force-quirks-to-i915-driver.patch
 + bugfix/x86/x86-quirk-fix-sb600-revision-check.patch
++ bugfix/all/r8169-Fix-up-backport-of-r8169-keep-firmware-in-memo.patch