rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop alx phy reset patch that is already in 3.13

Browse Source
This commit is contained in:
Josh Boyer 2014-02-28 09:39:38 -05:00
parent 7a2a6ee340
commit 0f778e07f8
2 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
alx-Reset-phy-speed-after-resume.patch
View File

@ -1,33 +0,0 @@
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

9
kernel.spec
View File

@ -718,9 +718,6 @@ Patch25047: drm-radeon-Disable-writeback-by-default-on-ppc.patch
#rhbz 993744
Patch25128: dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
#rhbz 1011362
Patch25148: alx-Reset-phy-speed-after-resume.patch
# Fix 15sec NFS mount delay
Patch25152: sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch
Patch25153: sunrpc-replace-gssd_running-with-more-reliable-check.patch
@ -1437,9 +1434,6 @@ ApplyPatch drm-radeon-Disable-writeback-by-default-on-ppc.patch
#rhbz 993744
ApplyPatch dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
#rhbz 1011362
ApplyPatch alx-Reset-phy-speed-after-resume.patch
# Fix 15sec NFS mount delay
ApplyPatch sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch
ApplyPatch sunrpc-replace-gssd_running-with-more-reliable-check.patch
@ -2305,6 +2299,9 @@ fi
# and build.
%changelog
* Fri Feb 28 2014 Josh Boyer <jwboyer@fedoraproject.org>
- Drop alx phy reset patch that is already in 3.13
* Tue Feb 25 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 3.13.5-101
* Fix module signing so secure boot works again