aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Rabau <pr2345@gmail.com>2010-02-15 19:42:11 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-16 15:19:04 -0800
commitc9885fe5a76dea798543f2938a872bc159e8e69a (patch)
tree47d0d0f90753dc2179cd36e12825b0e608ed3c50
parentbeb499afe3c9c006bb2d66ceaff0f354d0405ff4 (diff)
downloadvexpress-lsk-c9885fe5a76dea798543f2938a872bc159e8e69a.tar.gz
bnx2: Fix bug when saving statistics.
This fixes the problem of dropping the carry when adding 2 32-bit values. Switch to use array indexing for better readability. Reported by and fix provided by Patrick Rabau. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: Benjamin Li <benli@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bnx2.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index d1e5e5d9e98..3fb110edad4 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6555,16 +6555,16 @@ bnx2_save_stats(struct bnx2 *bp)
u32 hi;
u64 lo;
- hi = *(temp_stats + i) + *(hw_stats + i);
- lo = *(temp_stats + i + 1) + *(hw_stats + i + 1);
+ hi = temp_stats[i] + hw_stats[i];
+ lo = (u64) temp_stats[i + 1] + (u64) hw_stats[i + 1];
if (lo > 0xffffffff)
hi++;
- *(temp_stats + i) = hi;
- *(temp_stats + i + 1) = lo & 0xffffffff;
+ temp_stats[i] = hi;
+ temp_stats[i + 1] = lo & 0xffffffff;
}
for ( ; i < sizeof(struct statistics_block) / 4; i++)
- *(temp_stats + i) = *(temp_stats + i) + *(hw_stats + i);
+ temp_stats[i] += hw_stats[i];
}
#define GET_64BIT_NET_STATS64(ctr) \