From 0b654a623c48d130e2501985ca262994bfa0a472 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Nov 18 2013 15:56:02 +0000
Subject: Add patch to fix ALX phy issues after resume (rhbz 1011362)


---

diff --git a/alx-Reset-phy-speed-after-resume.patch b/alx-Reset-phy-speed-after-resume.patch
new file mode 100644
index 0000000..3af169f
--- /dev/null
+++ b/alx-Reset-phy-speed-after-resume.patch
@@ -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
diff --git a/kernel.spec b/kernel.spec
index b3f8acb..970d07a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -796,6 +796,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
@@ -1540,6 +1543,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
@@ -2353,6 +2359,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)
 
 * Thu Nov 14 2013 Josh Boyer <jwboyer@fedoraproject.org>