Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0933C10F13 for ; Mon, 8 Apr 2019 17:29:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9019820870 for ; Mon, 8 Apr 2019 17:29:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qJ9E7vtI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726818AbfDHR3y (ORCPT ); Mon, 8 Apr 2019 13:29:54 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:34593 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726025AbfDHR3y (ORCPT ); Mon, 8 Apr 2019 13:29:54 -0400 Received: by mail-wm1-f66.google.com with SMTP id r186so462580wmf.1 for ; Mon, 08 Apr 2019 10:29:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=Bmcl43yfMkutwityjug6GY53Dvz0u82N9G/Mkrv12y8=; b=qJ9E7vtIQzZjGu/dgcItGN6MbSWSNV+tGOEx6rrf+Xwifg3M/+knqCDYijDgtY/TDx yHyY9hsRD8inPMpEQS34YJ8E/RbtbgnQV2hFVnUk/5nlcZWE2BLU5IPq/JMDBK+fG9vi KWQI5V6WCG8DzJgRmtPFbhdcaG6+EG8Rc8B9ca1P5OP6hvw8n+y/IdBjG5nog3n4MrjI v95ZUSvzVpfaGzS3lC0+N8ljMj3nGc424Tp/0XySSnDM2qtlDzX8Z1Q/ocHaE9zkUjoF e40Fa3XIWatjWpVhRfUPCPKA5RYaVfuKezJDlTGl6kibgXBz5lN/8RGOuwO7a7zXBzj5 K2qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=Bmcl43yfMkutwityjug6GY53Dvz0u82N9G/Mkrv12y8=; b=clGSSKE2Nd6OZbElTvQKZzSDpOUbLx0Xdh5KuIPrOZ622p+yvds7zwKK+CI3ME7VSP rrifVhcOfifQdE7GL9PAYT5yIkkqeFCF+jVWeQZycaCbbbqQ0XHBKSYrRMowt+t/uVbZ TR22iKxlLPac37mosgMdbKgHWxECra56t5yPAxA+2TapB6z/we4qkhOTQ9NTQfIRzD2n wI7c+bf+y0EMweaiWVbQ67ZW+q2izLALK2CiQ6wthwrxVnFX9qkskHT91RDffmSWO6d1 2w0YUSLa0Mzj0NNUwGq3Yj2mOKnKo+WGpv2X6zDtdYNemFAiwJh9By5ncPfPbPAq4Ahu oX+g== X-Gm-Message-State: APjAAAXtJUwBNTIf9c820wuAJgAUCmXci9gZXz/PHj7ktkHSpKrai9am Dq9t4DI8ufLSaxbqXN0+2CQ= X-Google-Smtp-Source: APXvYqzdH7zqg1fsh0Vjg74gg4p9bZdKgRv4cmbOLlEh3nwCRqzNRoytC8sDSU+1uorucB0T9Nl2fw== X-Received: by 2002:a1c:3944:: with SMTP id g65mr18175439wma.34.1554744592368; Mon, 08 Apr 2019 10:29:52 -0700 (PDT) Received: from ?IPv6:2003:ea:8bde:d800:1488:bc0a:4c8c:6b35? (p200300EA8BDED8001488BC0A4C8C6B35.dip0.t-ipconnect.de. [2003:ea:8bde:d800:1488:bc0a:4c8c:6b35]) by smtp.googlemail.com with ESMTPSA id p6sm23221136wrs.6.2019.04.08.10.29.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 10:29:51 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH net-next] net: phy: fix setting autoneg_complete in genphy_update_link To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" , Simon Horman Message-ID: Date: Mon, 8 Apr 2019 19:28:28 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The original patch didn't set phydev->autoneg_complete in one exit path. Fix this. Fixes: 4950c2ba49cc ("net: phy: fix autoneg mismatch case in genphy_read_status") Reported-by: Simon Horman Tested-by: Simon Horman Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy_device.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index a6f3ad971..2df8f7737 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1710,19 +1710,17 @@ int genphy_update_link(struct phy_device *phydev) */ if (!phy_polling_mode(phydev)) { status = phy_read(phydev, MII_BMSR); - if (status < 0) { + if (status < 0) return status; - } else if (status & BMSR_LSTATUS) { - phydev->link = 1; - return 0; - } + else if (status & BMSR_LSTATUS) + goto done; } /* Read link and autonegotiation status */ status = phy_read(phydev, MII_BMSR); if (status < 0) return status; - +done: phydev->link = status & BMSR_LSTATUS ? 1 : 0; phydev->autoneg_complete = status & BMSR_ANEGCOMPLETE ? 1 : 0; -- 2.21.0