From: "Yuval Mintz" <yuvalmin@broadcom.com>
To: netdev@vger.kernel.org, davem@davemloft.net
Cc: eilong@broadcom.com, "Yuval Mintz" <yuvalmin@broadcom.com>
Subject: [RFC net-next 14/14] Fix broadcom/bnx2x
Date: Tue, 19 Jun 2012 18:14:08 +0300 [thread overview]
Message-ID: <1340118848-30978-15-git-send-email-yuvalmin@broadcom.com> (raw)
In-Reply-To: <1340118848-30978-1-git-send-email-yuvalmin@broadcom.com>
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
index 7cd99b7..99daadb 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
@@ -807,9 +807,10 @@ static inline void bnx2x_disable_msi(struct bnx2x *bp)
static inline int bnx2x_calc_num_queues(struct bnx2x *bp)
{
- return num_queues ?
- min_t(int, num_queues, BNX2X_MAX_QUEUES(bp)) :
- min_t(int, num_online_cpus(), BNX2X_MAX_QUEUES(bp));
+ int nqs = num_queues ? (int) num_queues :
+ min_t(int, num_online_cpus(), DEFAULT_MAX_NUM_RSS_QUEUES);
+
+ return min_t(int, nqs, BNX2X_MAX_QUEUES(bp));
}
static inline void bnx2x_clear_sge_mask_next_elems(struct bnx2x_fastpath *fp)
--
1.7.9.rc2
next prev parent reply other threads:[~2012-06-19 15:16 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-19 15:13 [RFC net-next 00/14] default maximal number of RSS queues in mq drivers Yuval Mintz
2012-06-19 15:13 ` [RFC net-next 01/14] Add Default Yuval Mintz
2012-06-19 16:37 ` Alexander Duyck
2012-06-19 17:41 ` Eilon Greenstein
2012-06-19 19:01 ` Alexander Duyck
2012-06-19 19:53 ` Eilon Greenstein
2012-06-19 21:26 ` David Miller
2012-06-19 21:22 ` David Miller
2012-06-19 15:13 ` [RFC net-next 02/14] Fix mellanox/mlx4 Yuval Mintz
2012-06-19 15:13 ` [RFC net-next 03/14] fix neterion/vxge Yuval Mintz
2012-06-19 15:13 ` [RFC net-next 04/14] Fix qlogic/qlge Yuval Mintz
2012-06-19 15:13 ` [RFC net-next 05/14] Fix intel/ixgbevf Yuval Mintz
2012-06-19 15:39 ` Alexander Duyck
2012-06-19 16:06 ` Eilon Greenstein
2012-06-19 18:07 ` Greg Rose
2012-06-19 18:24 ` Eilon Greenstein
2012-06-25 11:23 ` Yuval Mintz
2012-06-19 15:14 ` [RFC net-next 06/14] Fix intel/igb Yuval Mintz
2012-06-19 15:42 ` Alexander Duyck
2012-06-19 16:07 ` Eilon Greenstein
2012-06-19 15:14 ` [RFC net-next 07/14] Fix intel/ixgbe Yuval Mintz
2012-06-19 15:54 ` Alexander Duyck
2012-06-19 16:11 ` Eilon Greenstein
2012-06-20 8:55 ` Eric Dumazet
2012-06-20 15:30 ` John Fastabend
2012-06-19 15:14 ` [RFC net-next 08/14] Fix chelsio/cxgb3 Yuval Mintz
2012-06-19 15:14 ` [RFC net-next 09/14] Fix chelsio/cxgb4 Yuval Mintz
2012-06-19 15:14 ` [RFC net-next 10/14] Fix myricom/myri10ge Yuval Mintz
2012-06-19 15:14 ` [RFC net-next 11/14] Fix emulex/benet Yuval Mintz
2012-06-19 22:55 ` Ajit.Khaparde
2012-06-21 6:42 ` Sathya.Perla
2012-06-19 15:14 ` [RFC net-next 12/14] Fix broadcom/tg3 Yuval Mintz
2012-06-19 15:14 ` [RFC net-next 13/14] Fix broadcom/bnx2 Yuval Mintz
2012-06-19 15:14 ` Yuval Mintz [this message]
2012-06-19 16:17 ` [RFC net-next 00/14] default maximal number of RSS queues in mq drivers Eilon Greenstein
2012-06-20 20:43 ` Ben Hutchings
2012-06-20 20:48 ` Ben Hutchings
2012-06-21 5:15 ` Yuval Mintz
2012-06-21 5:49 ` 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=1340118848-30978-15-git-send-email-yuvalmin@broadcom.com \
--to=yuvalmin@broadcom.com \
--cc=davem@davemloft.net \
--cc=eilong@broadcom.com \
--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).