[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1472155583-12306-5-git-send-email-robert.foss@collabora.com>
Date: Thu, 25 Aug 2016 16:06:12 -0400
From: robert.foss@...labora.com
To: David Miller <davem@...emloft.net>,
Grant Grundler <grundler@...omium.org>, vpalatin@...gle.com
Cc: linux-kernel@...r.kernel.org, Grant Grundler <grundler@...gle.com>,
Robert Foss <robert.foss@...labora.com>
Subject: [PATCH v3 5/5] net: asix: autoneg will set WRITE_MEDIUM reg
From: Grant Grundler <grundler@...omium.org>
The miii_nway_restart() causes a PHY link change activity and
ax88772_link_reset will be called. link_reset will set
AX_CMD_WRITE_MEDIUM_MODE register correctly.
The asix_write_medium_mode in reset() fills in a default value to the register
which may be different from the negotiation result. So do this first.
Ignore the ret value since it's ignored in XXX_link_reset() functions.
Signed-off-by: Grant Grundler <grundler@...gle.com>
Signed-off-by: Robert Foss <robert.foss@...labora.com>
Tested-by: Robert Foss <robert.foss@...labora.com>
---
drivers/net/usb/asix_devices.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index dbcdda2..cce2495 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -928,12 +928,9 @@ static int ax88178_reset(struct usbnet *dev)
asix_mdio_write(dev->net, dev->mii.phy_id, MII_CTRL1000,
ADVERTISE_1000FULL);
+ asix_write_medium_mode(dev, AX88178_MEDIUM_DEFAULT, 0);
mii_nway_restart(&dev->mii);
- ret = asix_write_medium_mode(dev, AX88178_MEDIUM_DEFAULT, 0);
- if (ret < 0)
- return ret;
-
/* Rewrite MAC address */
memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN);
ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
--
2.7.4
Powered by blists - more mailing lists