diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2018-12-03 08:04:57 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-03 13:50:06 -0800 |
| commit | 6915bf3b002bba76cbbb928a983795fdd93af49b (patch) | |
| tree | 225feb5451fe4f67fe29c12524766ab925d6e27f | |
| parent | 97e6c858a26ee8a31719a08ae896ca682eb8978e (diff) | |
| download | linux-stable-6915bf3b002bba76cbbb928a983795fdd93af49b.tar.gz linux-stable-6915bf3b002bba76cbbb928a983795fdd93af49b.tar.bz2 linux-stable-6915bf3b002bba76cbbb928a983795fdd93af49b.zip | |
net: phy: don't allow __set_phy_supported to add unsupported modes
Currently __set_phy_supported allows to add modes w/o checking whether
the PHY supports them. This is wrong, it should never add modes but
only remove modes we don't want to support.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/phy_device.c | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 0904002b19a2..40404a8f5f5e 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1898,37 +1898,23 @@ EXPORT_SYMBOL(genphy_loopback); static int __set_phy_supported(struct phy_device *phydev, u32 max_speed) { - __ETHTOOL_DECLARE_LINK_MODE_MASK(speeds) = { 0, }; - - linkmode_set_bit_array(phy_10_100_features_array, - ARRAY_SIZE(phy_10_100_features_array), - speeds); - linkmode_set_bit_array(phy_gbit_features_array, - ARRAY_SIZE(phy_gbit_features_array), - speeds); - - linkmode_andnot(phydev->supported, phydev->supported, speeds); - switch (max_speed) { - default: - return -ENOTSUPP; - case SPEED_1000: - linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, - phydev->supported); - linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, - phydev->supported); + case SPEED_10: + linkmode_clear_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, + phydev->supported); + linkmode_clear_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, + phydev->supported); /* fall through */ case SPEED_100: - linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, - phydev->supported); - linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, - phydev->supported); - /* fall through */ - case SPEED_10: - linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, - phydev->supported); - linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT, - phydev->supported); + linkmode_clear_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, + phydev->supported); + linkmode_clear_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, + phydev->supported); + break; + case SPEED_1000: + break; + default: + return -ENOTSUPP; } return 0; |