diff options
| author | Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2017-02-28 22:03:10 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-02 21:57:53 +0100 |
| commit | 2697ea5a859b83ca49511dcfd98daf42584eb3cf (patch) | |
| tree | 4bfe06cf06d94760079e8472065c93b3db699cfb /drivers | |
| parent | amd-xgbe: Be sure to set MDIO modes on device (re)start (diff) | |
| download | linux-2697ea5a859b83ca49511dcfd98daf42584eb3cf.tar.xz linux-2697ea5a859b83ca49511dcfd98daf42584eb3cf.zip | |
amd-xgbe: Don't overwrite SFP PHY mod_absent settings
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>
Diffstat (limited to 'drivers')
| -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; |