diff options
| author | David Howells <dhowells@redhat.com> | 2019-09-02 11:43:44 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2019-09-02 11:43:44 +0100 |
| commit | f16180739cd18a39a1a45516ac0e65d18a9f100e (patch) | |
| tree | 22d1135650f8ddb25707c788cd4846c77b428ff0 /drivers/net/phy/phy.c | |
| parent | 9f159ae07f07fc540290f21937231034f554bdd7 (diff) | |
| parent | e1e54ec7fb55501c33b117c111cb0a045b8eded2 (diff) | |
| download | kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.tar.gz kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.tar.bz2 kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.zip | |
Merge remote-tracking branch 'net/master' into afs-next
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index ef7aa738e0dc..6b0f89369b46 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -507,7 +507,7 @@ static int phy_config_aneg(struct phy_device *phydev) * allowed to call genphy_config_aneg() */ if (phydev->is_c45 && !(phydev->c45_ids.devices_in_package & BIT(0))) - return -EOPNOTSUPP; + return genphy_c45_config_aneg(phydev); return genphy_config_aneg(phydev); } |