projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b42c676
)
amd-xgbe: Don't overwrite SFP PHY mod_absent settings
author
Lendacky, Thomas
<
[email protected]
>
Tue, 28 Feb 2017 21:03:10 +0000
(15:03 -0600)
committer
David S. Miller
<
[email protected]
>
Thu, 2 Mar 2017 20:57:53 +0000
(12:57 -0800)
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 <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
index 04804cbb7dc1cd694567667074900e90ae3c6768..e707c49cc55a785f9950685f73c03932a1117541 100644
(file)
--- 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;