From: "Michael Chan" <mchan@broadcom.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org
Subject: [PATCH -next 5/6] bnx2: Fix bug when saving statistics.
Date: Mon, 15 Feb 2010 21:42:11 -0800 [thread overview]
Message-ID: <1266298932-28129-5-git-send-email-mchan@broadcom.com> (raw)
In-Reply-To: <1266298932-28129-4-git-send-email-mchan@broadcom.com>
From: Patrick Rabau <pr2345@gmail.com>
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>
---
drivers/net/bnx2.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 2c75fd7..dda815a 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) \
--
1.6.4.GIT
next prev parent reply other threads:[~2010-02-16 5:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-16 5:42 [PATCH -next 1/6] bnx2: Check BNX2_FLAG_USING_MSIX flag when setting up MSIX Michael Chan
2010-02-16 5:42 ` [PATCH -next 2/6] bnx2: Need to call cnic_setup_cnic_irq_info() after MTU change Michael Chan
2010-02-16 5:42 ` [PATCH -next 3/6] bnx2: Adjust flow control water marks Michael Chan
2010-02-16 5:42 ` [PATCH -next 4/6] bnx2: Allow user-specified multiple advertisement speed values Michael Chan
2010-02-16 5:42 ` Michael Chan [this message]
2010-02-16 23:20 ` [PATCH -next 5/6] bnx2: Fix bug when saving statistics David Miller
[not found] ` <1266298932-28129-6-git-send-email-mchan@broadcom.com>
2010-02-16 23:20 ` [PATCH -next 6/6] bnx2: Update firmwares and update version to 2.0.8 David Miller
2010-02-16 23:20 ` [PATCH -next 4/6] bnx2: Allow user-specified multiple advertisement speed values David Miller
2010-02-16 23:20 ` [PATCH -next 3/6] bnx2: Adjust flow control water marks David Miller
2010-02-16 23:20 ` [PATCH -next 2/6] bnx2: Need to call cnic_setup_cnic_irq_info() after MTU change David Miller
2010-02-16 23:20 ` [PATCH -next 1/6] bnx2: Check BNX2_FLAG_USING_MSIX flag when setting up MSIX David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1266298932-28129-5-git-send-email-mchan@broadcom.com \
--to=mchan@broadcom.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).