openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Patrick Rabau 2010-02-15 19:42:11 +00:00 committed by David S. Miller
parent beb499afe3
commit c9885fe5a7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/bnx2.c
View File

@ -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) \