diff options
author | Andrew Lunn <andrew@lunn.ch> | 2018-12-05 21:49:41 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-12-06 01:26:16 +0100 |
commit | 78a24df370072ea3b7c0a466efd776fc8f87c73a (patch) | |
tree | ff4b6299aaccca612d270b23fcf4674ae216c8d3 /drivers/net/phy/marvell10g.c | |
parent | net: mii: Fix autoneg in mii_lpa_to_linkmode_lpa_t() (diff) | |
download | linux-78a24df370072ea3b7c0a466efd776fc8f87c73a.tar.xz linux-78a24df370072ea3b7c0a466efd776fc8f87c73a.zip |
net: mii: Rename mii_stat1000_to_linkmode_lpa_t
Rename mii_stat1000_to_linkmode_lpa_t to
mii_stat1000_mod_linkmode_lpa_t to indicate it modifies the passed
linkmode bitmap, without clearing any other bits.
Add a helper to set/clear bits in a linkmode.
Use this helper to ensure bit are clear which the stat1000 indicates
should not be set.
Fixes: c0ec3c273677 ("net: phy: Convert u32 phydev->lp_advertising to linkmode")
Suggested-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/marvell10g.c')
-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 6f6e886fc836..82ab6ed3b74e 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -490,7 +490,7 @@ static int mv3310_read_status(struct phy_device *phydev) if (val < 0) return val; - mii_stat1000_to_linkmode_lpa_t(phydev->lp_advertising, val); + mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val); if (phydev->autoneg == AUTONEG_ENABLE) phy_resolve_aneg_linkmode(phydev); |