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

Commit d3cec927 authored by Don Skidmore's avatar Don Skidmore Committed by David S. Miller
Browse files

ixgbe: Fix incorrect logic for fixed fiber eeprom write 



In this code we wanted to set the bit in IXGBE_SFF_SOFT_RS_SELECT_MASK to
the value in rs.  So we really needed a logical or rather than an and, this
patch makes that change.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de02decb

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

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ static void ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw, 
		goto out;

	}



	eeprom_data = (eeprom_data & ~IXGBE_SFF_SOFT_RS_SELECT_MASK) & rs;

	eeprom_data = (eeprom_data & ~IXGBE_SFF_SOFT_RS_SELECT_MASK) | rs;



	status = hw->phy.ops.write_i2c_byte(hw, IXGBE_SFF_SFF_8472_OSCB,

					    IXGBE_I2C_EEPROM_DEV_ADDR2,