From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757153AbcHYUOz (ORCPT ); Thu, 25 Aug 2016 16:14:55 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:44636 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756630AbcHYUOm (ORCPT ); Thu, 25 Aug 2016 16:14:42 -0400 From: robert.foss@collabora.com To: David Miller , Grant Grundler , vpalatin@google.com Cc: linux-kernel@vger.kernel.org, Grant Grundler , Robert Foss Subject: [PATCH v3 5/5] net: asix: autoneg will set WRITE_MEDIUM reg Date: Thu, 25 Aug 2016 16:06:12 -0400 Message-Id: <1472155583-12306-5-git-send-email-robert.foss@collabora.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Grant Grundler 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 Signed-off-by: Robert Foss Tested-by: Robert Foss --- 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