From: Chris Wright <chrisw@sous-sol.org>
Date: Thu, 23 Apr 2009 16:24:45 +0000 (-0700)
Subject: 2.6.29: start queue for .3 cycle
X-Git-Tag: v2.6.29.2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44069301063218d91d8209255c4e57349a6c9cbf;p=thirdparty%2Fkernel%2Fstable-queue.git

2.6.29: start queue for .3 cycle
---

diff --git a/queue-2.6.29/forcedeth-fix-resume-from-hibernation-regression.patch b/queue-2.6.29/forcedeth-fix-resume-from-hibernation-regression.patch
new file mode 100644
index 00000000000..2432b411aaa
--- /dev/null
+++ b/queue-2.6.29/forcedeth-fix-resume-from-hibernation-regression.patch
@@ -0,0 +1,30 @@
+From 35a7433c789ba6df6d96b70fa745ae9e6cac0038 Mon Sep 17 00:00:00 2001
+From: Ed Swierk <eswierk@aristanetworks.com>
+Date: Mon, 6 Apr 2009 17:49:12 -0700
+Subject: forcedeth: Fix resume from hibernation regression.
+
+upstream commit: 35a7433c789ba6df6d96b70fa745ae9e6cac0038
+
+Reset phy state on resume, fixing a regression caused by powering down
+the phy on hibernate.
+
+Signed-off-by: Ed Swierk <eswierk@aristanetworks.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Tvrtko Ursulin <tvrtko.ursulin@sophos.com>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ drivers/net/forcedeth.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/net/forcedeth.c
++++ b/drivers/net/forcedeth.c
+@@ -5995,6 +5995,9 @@ static int nv_resume(struct pci_dev *pde
+ 	for (i = 0;i <= np->register_size/sizeof(u32); i++)
+ 		writel(np->saved_config_space[i], base+i*sizeof(u32));
+ 
++	/* restore phy state, including autoneg */
++	phy_init(dev);
++
+ 	netif_device_attach(dev);
+ 	if (netif_running(dev)) {
+ 		rc = nv_open(dev);
diff --git a/queue-2.6.29/series b/queue-2.6.29/series
new file mode 100644
index 00000000000..a0518bf6e3a
--- /dev/null
+++ b/queue-2.6.29/series
@@ -0,0 +1 @@
+forcedeth-fix-resume-from-hibernation-regression.patch