[RFC net-next 11/14] Fix emulex/benet
From: Yuval Mintz <hidden>
Date: 2012-06-19 15:16:53
Subsystem:
emulex 10gbps nic be2, be3-r, lancer, skyhawk-r driver (be2net), networking drivers, the rest · Maintainers:
Ajit Khaparde, Sriharsha Basavapatna, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Signed-off-by: Yuval Mintz <redacted> Signed-off-by: Eilon Greenstein <redacted> Cc: Sathya Perla <redacted> Cc: Subbu Seetharaman <redacted> Cc: Ajit Khaparde <redacted> --- drivers/net/ethernet/emulex/benet/be_main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 5a34503..e42597d 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c@@ -2153,13 +2153,15 @@ static uint be_num_rss_want(struct be_adapter *adapter) static void be_msix_enable(struct be_adapter *adapter) { #define BE_MIN_MSIX_VECTORS 1 - int i, status, num_vec, num_roce_vec = 0; + int i, status, num_vec, num_roce_vec = 0, ncpu; + + ncpu = min_t(int, num_online_cpus(), DEFAULT_MAX_NUM_RSS_QUEUES); /* If RSS queues are not used, need a vec for default RX Q */ - num_vec = min(be_num_rss_want(adapter), num_online_cpus()); + num_vec = min(be_num_rss_want(adapter), ncpu); if (be_roce_supported(adapter)) { num_roce_vec = min_t(u32, MAX_ROCE_MSIX_VECTORS, - (num_online_cpus() + 1)); + (u32)(ncpu + 1)); num_roce_vec = min(num_roce_vec, MAX_ROCE_EQS); num_vec += num_roce_vec; num_vec = min(num_vec, MAX_MSIX_VECTORS);
--
1.7.9.rc2