summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorhahnjo <hahnjo@hahnjo.de>2013-11-12 18:19:24 +0100
committerDavid S. Miller <davem@davemloft.net>2013-11-14 17:14:42 -0500
commitb54629e226d196e802abdd30c5e34f2a47cddcf2 (patch)
tree47ef08970b432a94ae7b3e307646cf55822c445e /drivers/net/ethernet
parent4fb09a8705623b84a9f085345aa59b38d3649902 (diff)
downloadlinux-stable-b54629e226d196e802abdd30c5e34f2a47cddcf2.tar.gz
linux-stable-b54629e226d196e802abdd30c5e34f2a47cddcf2.tar.bz2
linux-stable-b54629e226d196e802abdd30c5e34f2a47cddcf2.zip
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>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/atheros/alx/main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index 5aa5e8146496..c3c4c266b846 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;