From 46df32f79bc1c3d8db11250efeae1c8cbf419f1f Mon Sep 17 00:00:00 2001 From: Yuval Mintz Date: Sun, 1 Jul 2012 03:18:59 +0000 Subject: [PATCH] --- yaml --- r: 314991 b: refs/heads/master c: 7d515413557907078e805ee7fd6f3920bc33762d h: refs/heads/master i: 314989: c254547369534c9688ae89621534ce795a7e24a8 314987: af8d37f324d300e93e33168c2866cb46fda796e1 314983: 65cd4961c9df2ac872dcbffc754621cbfd7cf610 314975: b2284f5919e118ed0c6aff960320b7621e715fca v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8e8e418a43d9..b58fc4396457 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a742128db29031e55d27e37b1b098433c56033a +refs/heads/master: 7d515413557907078e805ee7fd6f3920bc33762d diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h index daa894bd772a..53659f321d51 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h @@ -822,7 +822,8 @@ 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)); + min_t(int, netif_get_num_default_rss_queues(), + BNX2X_MAX_QUEUES(bp)); } static inline void bnx2x_clear_sge_mask_next_elems(struct bnx2x_fastpath *fp)