diff options
author | Emil Tantilov <emil.s.tantilov@intel.com> | 2013-02-05 04:43:26 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2013-04-18 00:24:59 -0400 |
commit | d01115752f5e37b2c79280d60c0e8e19267a0cc9 (patch) | |
tree | 8a53f798b5395b17760b02d8617f3cd0b31e8346 /drivers/net/ethernet | |
parent | 20967f42025f50e8497e6d71259ac5fb56655736 (diff) |
ixgbe: don't do arithmetic operations on bitmasks
Make the calculation of eerd consistent between the read and write functions
by using | instead of + for IXGBE_EEPROM_RW_REG_START
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Emil Tantilov <emil.s.tantilov@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')
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c index 99e472ebaa75..f8d3deccc9b2 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | |||
@@ -1125,7 +1125,7 @@ s32 ixgbe_read_eerd_buffer_generic(struct ixgbe_hw *hw, u16 offset, | |||
1125 | } | 1125 | } |
1126 | 1126 | ||
1127 | for (i = 0; i < words; i++) { | 1127 | for (i = 0; i < words; i++) { |
1128 | eerd = ((offset + i) << IXGBE_EEPROM_RW_ADDR_SHIFT) + | 1128 | eerd = ((offset + i) << IXGBE_EEPROM_RW_ADDR_SHIFT) | |
1129 | IXGBE_EEPROM_RW_REG_START; | 1129 | IXGBE_EEPROM_RW_REG_START; |
1130 | 1130 | ||
1131 | IXGBE_WRITE_REG(hw, IXGBE_EERD, eerd); | 1131 | IXGBE_WRITE_REG(hw, IXGBE_EERD, eerd); |