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