diff options
| author |   Don Skidmore <donald.c.skidmore@intel.com> | 2014-01-16 02:30:10 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-01-16 15:34:25 -0800 |
| commit | d3cec927ef9f5783b5658e27401425fda4a2d4d9 (patch) | |
| tree | 39d0ca38a98f9ca6690b5653f1dc79108e473c9d | |
| parent | ixgbevf: create function for all of ring init (diff) | |
| download | linux-dev-d3cec927ef9f5783b5658e27401425fda4a2d4d9.tar.xz linux-dev-d3cec927ef9f5783b5658e27401425fda4a2d4d9.zip | |
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: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c index 007a0083a636..edda6814108c 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c @@ -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, |