Message ID | 1340118848-30978-15-git-send-email-yuvalmin@broadcom.com |
---|---|
State | RFC, archived |
Delegated to: | David Miller |
Headers | show |
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)