From patchwork Mon Jun 12 12:54:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Bogendoerfer X-Patchwork-Id: 774640 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wmZBl6xnjz9s3T for ; Mon, 12 Jun 2017 23:54:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752308AbdFLNyW (ORCPT ); Mon, 12 Jun 2017 09:54:22 -0400 Received: from elvis.franken.de ([193.175.24.41]:60397 "EHLO elvis.franken.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751955AbdFLNyV (ORCPT ); Mon, 12 Jun 2017 09:54:21 -0400 X-Greylist: delayed 1253 seconds by postgrey-1.27 at vger.kernel.org; Mon, 12 Jun 2017 09:54:21 EDT Received: from uucp (helo=solo.franken.de) by elvis.franken.de with local-bsmtp (Exim 3.36 #1) id 1dKPTH-0005Us-00; Mon, 12 Jun 2017 15:33:31 +0200 Received: by solo.franken.de (Postfix, from userid 1000) id E20945085BC; Mon, 12 Jun 2017 15:32:37 +0200 (CEST) From: Thomas Bogendoerfer Date: Mon, 12 Jun 2017 14:54:57 +0200 Subject: [net-next] net: phy: marvell: Show complete link partner advertising To: andrew@lunn.ch, f.fainelli@gmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Message-Id: <20170612133237.E20945085BC@solo.franken.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Thomas Bogendoerfer Give back all modes advertised by the link partner. This change brings the marvell phy driver in line with all other phy drivers. Signed-off-by: Thomas Bogendoerfer Reviewed-by: Florian Fainelli --- drivers/net/phy/marvell.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 4c5246fed69b..8400403b3f62 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1139,7 +1139,6 @@ static int marvell_read_status_page_an(struct phy_device *phydev, int status; int lpa; int lpagb; - int adv; status = phy_read(phydev, MII_M1011_PHY_STATUS); if (status < 0) @@ -1153,12 +1152,6 @@ static int marvell_read_status_page_an(struct phy_device *phydev, if (lpagb < 0) return lpagb; - adv = phy_read(phydev, MII_ADVERTISE); - if (adv < 0) - return adv; - - lpa &= adv; - if (status & MII_M1011_PHY_STATUS_FULLDUPLEX) phydev->duplex = DUPLEX_FULL; else