rpms/kernel/F-10 linux-2.6-forcedeth-fix-resume-from-hibernate.patch, NONE, 1.1 kernel.spec, 1.1341, 1.1342

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5485

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-forcedeth-fix-resume-from-hibernate.patch 
Log Message:
Fix loss of link on resume from hibernate with forcdeth adapter (reported in Bodhi)

linux-2.6-forcedeth-fix-resume-from-hibernate.patch:

--- NEW FILE linux-2.6-forcedeth-fix-resume-from-hibernate.patch ---
From: Ed Swierk <eswierk at aristanetworks.com>
Date: Tue, 7 Apr 2009 00:49:12 +0000 (-0700)
Subject: forcedeth: Fix resume from hibernation regression.
X-Git-Tag: v2.6.30-rc1~137^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=35a7433c789ba6df6d96b70fa745ae9e6cac0038

forcedeth: Fix resume from hibernation regression.

Reset phy state on resume, fixing a regression caused by powering down
the phy on hibernate.

Signed-off-by: Ed Swierk <eswierk at aristanetworks.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
[cebbert at redhat.com: backport to 2.6.29]
---

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index a858c6f..663a7b3 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -6117,6 +6117,9 @@ static int nv_resume(struct pci_dev *pdev)
 	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);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1341
retrieving revision 1.1342
diff -u -r1.1341 -r1.1342
--- kernel.spec	22 Apr 2009 14:45:39 -0000	1.1341
+++ kernel.spec	22 Apr 2009 15:12:33 -0000	1.1342
@@ -700,6 +700,7 @@
 # patches headed for -stable
 # make RLIMIT_CPU work again
 Patch7002: linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
+Patch7010: linux-2.6-forcedeth-fix-resume-from-hibernate.patch
 
 Patch9000: squashfs3.patch
 Patch9001: squashfs-fixups.patch
@@ -1311,6 +1312,7 @@
 
 # patches headed for -stable
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
+ApplyPatch linux-2.6-forcedeth-fix-resume-from-hibernate.patch
 
 # we need squashfs3 for Fedora-10
 ApplyPatch squashfs3.patch
@@ -1911,6 +1913,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-42
+- Fix loss of link on resume from hibernate with forcdeth adapter (reported in Bodhi)
+
 * Wed Apr 22 2009 John W. Linville <linville at redhat.com> 2.6.29.1-41
 - back-port mac80211: fix beacon loss detection after scan