Add patch to fix ALX phy issues after resume (rhbz 1011362)

This commit is contained in:
Josh Boyer 2013-11-18 10:55:44 -05:00
parent ced5d350f3
commit 0c83a7bef5
2 changed files with 40 additions and 0 deletions

View File

@ -0,0 +1,33 @@
Bugzilla: 1011362
Upstream-status: queued for 3.13
From b54629e226d196e802abdd30c5e34f2a47cddcf2 Mon Sep 17 00:00:00 2001
From: hahnjo <hahnjo@hahnjo.de>
Date: Tue, 12 Nov 2013 17:19:24 +0000
Subject: alx: Reset phy speed after resume
This fixes bug 62491 (https://bugzilla.kernel.org/show_bug.cgi?id=62491).
After resuming some users got the following error flooding the kernel log:
alx 0000:02:00.0: invalid PHY speed/duplex: 0xffff
Signed-off-by: Jonas Hahnfeld <linux@hahnjo.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
(limited to 'drivers/net/ethernet/atheros/alx')
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index 5aa5e81..c3c4c26 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -1388,6 +1388,9 @@ static int alx_resume(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
struct alx_priv *alx = pci_get_drvdata(pdev);
+ struct alx_hw *hw = &alx->hw;
+
+ alx_reset_phy(hw);
if (!netif_running(alx->dev))
return 0;
--
cgit v0.9.2

View File

@ -749,6 +749,9 @@ Patch25145: ipv6-fix-headroom-calculation-in-udp6_ufo_fragment.patch
Patch25146: 0001-ip6_output-fragment-outgoing-reassembled-skb-properl.patch
Patch25147: 0002-netfilter-push-reasm-skb-through-instead-of-original.patch
#rhbz 1011362
Patch25148: alx-Reset-phy-speed-after-resume.patch
# END OF PATCH DEFINITIONS
%endif
@ -1466,6 +1469,9 @@ ApplyPatch ipv6-fix-headroom-calculation-in-udp6_ufo_fragment.patch
ApplyPatch 0001-ip6_output-fragment-outgoing-reassembled-skb-properl.patch
ApplyPatch 0002-netfilter-push-reasm-skb-through-instead-of-original.patch
#rhbz 1011362
ApplyPatch alx-Reset-phy-speed-after-resume.patch
# END OF PATCH APPLICATIONS
%endif
@ -2270,6 +2276,7 @@ fi
# || ||
%changelog
* Mon Nov 18 2013 Josh Boyer <jwboyer@fedoraproject.org>
- Add patch to fix ALX phy issues after resume (rhbz 1011362)
- Fix ipv6 sit panic with packet size > mtu (from Michele Baldessari) (rbhz 1015905)
* Sun Nov 17 2013 Peter Robinson <pbrobinson@fedoraproject.org>