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:
65a29da
)
e1000e: Fix return value test
author
Benjamin Poirier
<
[email protected]
>
Fri, 21 Jul 2017 18:36:25 +0000
(11:36 -0700)
committer
Jeff Kirsher
<
[email protected]
>
Tue, 10 Oct 2017 15:33:24 +0000
(08:33 -0700)
All the helpers return -E1000_ERR_PHY.
Signed-off-by: Benjamin Poirier <
[email protected]
>
Tested-by: Aaron Brown <
[email protected]
>
Signed-off-by: Jeff Kirsher <
[email protected]
>
drivers/net/ethernet/intel/e1000e/netdev.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/intel/e1000e/netdev.c
b/drivers/net/ethernet/intel/e1000e/netdev.c
index ead4c112580e629af76798fee6b5ce97cf5ace9a..a740de6a30b0362f8c0a9e90359f9b5dd19c885c 100644
(file)
--- a/
drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/
drivers/net/ethernet/intel/e1000e/netdev.c
@@
-5099,7
+5099,7
@@
static bool e1000e_has_link(struct e1000_adapter *adapter)
break;
}
- if ((ret_val == E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) &&
+ if ((ret_val ==
-
E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) &&
(er32(CTRL) & E1000_PHY_CTRL_GBE_DISABLE)) {
/* See e1000_kmrn_lock_loss_workaround_ich8lan() */
e_info("Gigabit has been disabled, downgrading speed\n");