diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:06 +0100 |
| commit | ec665af5dd517c60ea1fbe791f6c8ecc443a61b6 (patch) | |
| tree | adfe7a2578ecde6d65e927afe65b289efb458ab1 /drivers/net/phy/phy_device.c | |
| parent | 46543af4c9edc5701729b24dd395c23a40871aa9 (diff) | |
| parent | f952480a8fc14ea24a4de9582e425924f98c92d3 (diff) | |
Merge tag 'v4.14.58' into linux-linaro-lsk-v4.14lsk-v4.14-18.07
This is the 4.14.58 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 a1e7ea4d4b16..a174d05a9752 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1686,11 +1686,8 @@ EXPORT_SYMBOL(genphy_loopback); 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: |