summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel
diff options
context:
space:
mode:
authorTodd Fujinaka2016-11-28 18:09:57 +0100
committerJeff Kirsher2017-01-06 11:23:01 +0100
commit5bc8c230e2a993b49244f9457499f17283da9ec7 (patch)
tree2e309862b6624636d62da6daaa8086130ecf2811 /drivers/net/ethernet/intel
parentigb: close/suspend race in netif_device_detach (diff)
downloadkernel-qcow2-linux-5bc8c230e2a993b49244f9457499f17283da9ec7.tar.gz
kernel-qcow2-linux-5bc8c230e2a993b49244f9457499f17283da9ec7.tar.xz
kernel-qcow2-linux-5bc8c230e2a993b49244f9457499f17283da9ec7.zip
igb: add i211 to i210 PHY workaround
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 <todd.fujinaka@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel')
-rw-r--r--drivers/net/ethernet/intel/igb/e1000_phy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
index 569ee25642b4..2788a5409023 100644
--- 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);