diff options
| author | Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2017-02-28 15:03:10 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-22 12:56:58 +0100 |
| commit | 0ee7666f639aa820ad2ae3cb7f36b5487443e0b0 (patch) | |
| tree | a1a25e93b481f38478bd01104dc5dfadb33a4d74 | |
| parent | 9919f222968c0d311c8c2f658eef767529981504 (diff) | |
| download | linux-stable-0ee7666f639aa820ad2ae3cb7f36b5487443e0b0.tar.gz linux-stable-0ee7666f639aa820ad2ae3cb7f36b5487443e0b0.tar.bz2 linux-stable-0ee7666f639aa820ad2ae3cb7f36b5487443e0b0.zip | |
amd-xgbe: Don't overwrite SFP PHY mod_absent settings
[ Upstream commit 2697ea5a859b83ca49511dcfd98daf42584eb3cf ]
If an SFP module is not present, xgbe_phy_sfp_phy_settings() should
return after applying the default settings. Currently there is no return
statement and the default settings are overwritten.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c index 04804cbb7dc1..e707c49cc55a 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c @@ -716,6 +716,8 @@ static void xgbe_phy_sfp_phy_settings(struct xgbe_prv_data *pdata) pdata->phy.duplex = DUPLEX_UNKNOWN; pdata->phy.autoneg = AUTONEG_ENABLE; pdata->phy.advertising = pdata->phy.supported; + + return; } pdata->phy.advertising &= ~ADVERTISED_Autoneg; |