From: "Michael Chan" <mchan@broadcom.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, nsujir@broadcom.com
Subject: [PATCH net-next 4/4] tg3: Use tp->rxq_cnt when checking RSS tables.
Date: Wed, 14 Nov 2012 16:44:29 -0800 [thread overview]
Message-ID: <1352940269-23821-4-git-send-email-mchan@broadcom.com> (raw)
In-Reply-To: <1352940269-23821-3-git-send-email-mchan@broadcom.com>
irq_cnt is no longer reliable since rxq_cnt can be independently configured.
Update version to 3.127.
Signed-off-by: Michael Chan <mchan@broadcom.com>
---
drivers/net/ethernet/broadcom/tg3.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index ffff018..5cc976d 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -90,10 +90,10 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)
#define DRV_MODULE_NAME "tg3"
#define TG3_MAJ_NUM 3
-#define TG3_MIN_NUM 126
+#define TG3_MIN_NUM 127
#define DRV_MODULE_VERSION \
__stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)
-#define DRV_MODULE_RELDATE "November 05, 2012"
+#define DRV_MODULE_RELDATE "November 14, 2012"
#define RESET_KIND_SHUTDOWN 0
#define RESET_KIND_INIT 1
@@ -8710,14 +8710,14 @@ static void tg3_rss_check_indir_tbl(struct tg3 *tp)
if (!tg3_flag(tp, SUPPORT_MSIX))
return;
- if (tp->irq_cnt <= 2) {
+ if (tp->rxq_cnt == 1) {
memset(&tp->rss_ind_tbl[0], 0, sizeof(tp->rss_ind_tbl));
return;
}
/* Validate table against current IRQ count */
for (i = 0; i < TG3_RSS_INDIR_TBL_SIZE; i++) {
- if (tp->rss_ind_tbl[i] >= tp->irq_cnt - 1)
+ if (tp->rss_ind_tbl[i] >= tp->rxq_cnt)
break;
}
--
1.7.1
next prev parent reply other threads:[~2012-11-15 0:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-15 0:44 [PATCH net-next 1/4] tg3: Set 10_100_ONLY flag for additional 10/100 Mbps devices Michael Chan
2012-11-15 0:44 ` [PATCH net-next 2/4] tg3: Prevent spurious tx timeout by setting carrier off before tx disable Michael Chan
2012-11-15 0:44 ` [PATCH net-next 3/4] tg3: Cleanup hardcoded ethtool test array indexes Michael Chan
2012-11-15 0:44 ` Michael Chan [this message]
2012-11-15 3:05 ` [PATCH net-next 4/4] tg3: Use tp->rxq_cnt when checking RSS tables David Miller
2012-11-15 3:05 ` [PATCH net-next 3/4] tg3: Cleanup hardcoded ethtool test array indexes David Miller
2012-11-15 3:05 ` [PATCH net-next 2/4] tg3: Prevent spurious tx timeout by setting carrier off before tx disable David Miller
2012-11-15 3:05 ` [PATCH net-next 1/4] tg3: Set 10_100_ONLY flag for additional 10/100 Mbps devices 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=1352940269-23821-4-git-send-email-mchan@broadcom.com \
--to=mchan@broadcom.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=nsujir@broadcom.com \
/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