diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-04-28 23:01:50 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-04-28 23:02:01 +0300 |
| commit | 0e55546b189fc5f1ce5149445d7df083f26d4f25 (patch) | |
| tree | 0ed58feac725c81dd27a4533bea24c328898e877 /drivers/net/phy | |
| parent | f3412b3879b4f7c4313b186b03940d4791345534 (diff) | |
| parent | 249aca0d3d631660aa3583c6a3559b75b6e971b4 (diff) | |
| download | linux-0e55546b189fc5f1ce5149445d7df083f26d4f25.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/linux/netdevice.h
net/core/dev.c
6510ea973d8d ("net: Use this_cpu_inc() to increment net->core_stats")
794c24e9921f ("net-core: rx_otherhost_dropped to core_stats")
https://lore.kernel.org/all/20220428111903.5f4304e0@canb.auug.org.au/
drivers/net/wan/cosa.c
d48fea8401cf ("net: cosa: fix error check return value of register_chrdev()")
89fbca3307d4 ("net: wan: remove support for COSA and SRP synchronous serial boards")
https://lore.kernel.org/all/20220428112130.1f689e5e@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/marvell10g.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index b6fea119fe13..2b7d0720720b 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -880,7 +880,7 @@ static int mv3310_read_status_copper(struct phy_device *phydev) cssr1 = phy_read_mmd(phydev, MDIO_MMD_PCS, MV_PCS_CSSR1); if (cssr1 < 0) - return val; + return cssr1; /* If the link settings are not resolved, mark the link down */ if (!(cssr1 & MV_PCS_CSSR1_RESOLVED)) { |