summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
diff options
context:
space:
mode:
authorDon Skidmore2015-06-10 02:48:54 +0200
committerJeff Kirsher2015-06-10 02:48:54 +0200
commit7e49d6165e4a6c5df7f32c16976b33bfd830b92c (patch)
treebd4982e6390c4e7873a6f0124eff04f7c8583c22 /drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
parentixgbe: add link check for X550 copper (diff)
downloadkernel-qcow2-linux-7e49d6165e4a6c5df7f32c16976b33bfd830b92c.tar.gz
kernel-qcow2-linux-7e49d6165e4a6c5df7f32c16976b33bfd830b92c.tar.xz
kernel-qcow2-linux-7e49d6165e4a6c5df7f32c16976b33bfd830b92c.zip
ixgbe: Set lan_id before using I2C
We need to call the set_lan_id before accessing I2C and this wasn't being done so this patch corrects that. Likewise we do the same for QSFP just to be consistent. In the X550 case this is even more important as with out it the mux is not controlled properly. Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com> Tested-by: Krishneil Singh <krishneil.k.singh@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
index dc320af618af..d65327ec7350 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -1457,6 +1457,8 @@ static s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)
ixgbe_link_speed speed;
s32 ret_val;
+ hw->mac.ops.set_lan_id(hw);
+
if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) {
phy->phy_semaphore_mask = IXGBE_GSSR_SHARED_I2C_SM;
ixgbe_setup_mux_ctl(hw);