Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da4ea4ba authored by Mark Rustad's avatar Mark Rustad Committed by Jeff Kirsher
Browse files

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: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent bb5ce9a5

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

+3 −3
Original line number Diff line number Diff line
@@ -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;