Skip to content

Commit

Permalink
bnx2: Fix bug when saving statistics.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Patrick Rabau authored and davem330 committed Feb 16, 2010
1 parent beb499a commit c9885fe
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/net/bnx2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down

0 comments on commit c9885fe

Please sign in to comment.