lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date:   Wed, 21 Jul 2021 17:01:28 +0200
From:   Arnd Bergmann <arnd@...nel.org>
To:     Andrew Lunn <andrew@...n.ch>,
        Heiner Kallweit <hkallweit1@...il.com>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Russell King <linux@...linux.org.uk>,
        "David S. Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        David Bauer <mail@...id-bauer.net>,
        Michael Walle <michael@...le.cc>,
        Ioana Ciornei <ioana.ciornei@....com>,
        Ansuel Smith <ansuelsmth@...il.com>,
        Fabio Estevam <festevam@...il.com>, netdev@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: [PATCH] net: phy: at803x: fix at803x_match_phy_id mismatch

From: Arnd Bergmann <arnd@...db.de>

There are two conflicting patches in net-next, one removed
the at803x_get_features() function and the other added another
user:

drivers/net/phy/at803x.c: In function 'at803x_get_features':
drivers/net/phy/at803x.c:706:14: error: implicit declaration of function 'at803x_match_phy_id' [-Werror=implicit-function-declaration]

Change the new caller over to an open-coded comparison as well.

Fixes: 8887ca5474bd ("net: phy: at803x: simplify custom phy id matching")
Fixes: b856150c8098 ("net: phy: at803x: mask 1000 Base-X link mode")
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
 drivers/net/phy/at803x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 0790ffcd3db6..bdac087058b2 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -703,7 +703,7 @@ static int at803x_get_features(struct phy_device *phydev)
 	if (err)
 		return err;
 
-	if (!at803x_match_phy_id(phydev, ATH8031_PHY_ID))
+	if (phydev->drv->phy_id != ATH8031_PHY_ID)
 		return 0;
 
 	/* AR8031/AR8033 have different status registers
-- 
2.29.2

Powered by blists - more mailing lists