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:
9474933
)
igb: add i211 to i210 PHY workaround
author
Todd Fujinaka
<
[email protected]
>
Mon, 28 Nov 2016 17:09:57 +0000
(09:09 -0800)
committer
Jeff Kirsher
<
[email protected]
>
Fri, 6 Jan 2017 10:23:01 +0000
(
02:23
-0800)
i210 and i211 share the same PHY but have different PCI IDs. Don't
forget i211 for any i210 workarounds.
Signed-off-by: Todd Fujinaka <
[email protected]
>
Tested-by: Aaron Brown <
[email protected]
>
Signed-off-by: Jeff Kirsher <
[email protected]
>
drivers/net/ethernet/intel/igb/e1000_phy.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/intel/igb/e1000_phy.c
b/drivers/net/ethernet/intel/igb/e1000_phy.c
index 569ee25642b459ec9665aac90d8573c24b04e81a..2788a5409023ef41ad9ba62620acbc398b96d490 100644
(file)
--- a/
drivers/net/ethernet/intel/igb/e1000_phy.c
+++ b/
drivers/net/ethernet/intel/igb/e1000_phy.c
@@
-78,7
+78,7
@@
s32 igb_get_phy_id(struct e1000_hw *hw)
u16 phy_id;
/* ensure PHY page selection to fix misconfigured i210 */
- if (
hw->mac.type == e1000_i210
)
+ if (
(hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211)
)
phy->ops.write_reg(hw, I347AT4_PAGE_SELECT, 0);
ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);