diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:18 +0100 |
| commit | 8c9257333713c1f185693fe0df2df79dfc1fa1c8 (patch) | |
| tree | 60d7fb9170d3cf462685be490b59bf1c012389d3 /drivers/net/phy/phy_device.c | |
| parent | 953cb6f07855d41f79b6faa2f334d11116d54afb (diff) | |
| parent | dbcdf42bab53d219caa51bcfe54c8b9066010290 (diff) | |
Merge tag 'v4.9.115' into linux-linaro-lsk-v4.9lsk-v4.9-18.07
This is the 4.9.115 stable release
Diffstat (limited to 'drivers/net/phy/phy_device.c')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index bf02f8e4648a..b131e555d3c2 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1579,11 +1579,8 @@ static int gen10g_resume(struct phy_device *phydev) static int __set_phy_supported(struct phy_device *phydev, u32 max_speed) { - /* The default values for phydev->supported are provided by the PHY - * driver "features" member, we want to reset to sane defaults first - * before supporting higher speeds. - */ - phydev->supported &= PHY_DEFAULT_FEATURES; + phydev->supported &= ~(PHY_1000BT_FEATURES | PHY_100BT_FEATURES | + PHY_10BT_FEATURES); switch (max_speed) { default: |