diff options
| author | Mark Rustad | 2015-08-09 01:18:07 +0200 |
|---|---|---|
| committer | Jeff Kirsher | 2015-09-23 00:58:31 +0200 |
| commit | da4ea4baf77c9e45c53671e465043ffaf26fd45d (patch) | |
| tree | 3577e99f966d7dfd394ea793e2af2b544999e32c /drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | |
| parent | ixgbe: Provide unlocked I2C methods (diff) | |
| download | kernel-qcow2-linux-da4ea4baf77c9e45c53671e465043ffaf26fd45d.tar.gz kernel-qcow2-linux-da4ea4baf77c9e45c53671e465043ffaf26fd45d.tar.xz kernel-qcow2-linux-da4ea4baf77c9e45c53671e465043ffaf26fd45d.zip | |
ixgbe: Set lan_id before first I2C eeprom access
The lan_id is being set after a previous I2C eeprom access which
makes no sense because it needs to be set before any access. Move
the setting to before the access.
Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c index 0856d0bf821e..2b238caec826 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c @@ -1171,6 +1171,9 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) return IXGBE_ERR_SFP_NOT_PRESENT; } + /* LAN ID is needed for sfp_type determination */ + hw->mac.ops.set_lan_id(hw); + status = hw->phy.ops.read_i2c_eeprom(hw, IXGBE_SFF_IDENTIFIER, &identifier); @@ -1178,9 +1181,6 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) if (status) goto err_read_i2c_eeprom; - /* LAN ID is needed for sfp_type determination */ - hw->mac.ops.set_lan_id(hw); - if (identifier != IXGBE_SFF_IDENTIFIER_SFP) { hw->phy.type = ixgbe_phy_sfp_unsupported; return IXGBE_ERR_SFP_NOT_SUPPORTED; |