aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuval Mintz <yuvalmin@broadcom.com>2012-06-30 23:18:51 -0400
committerDavid S. Miller <davem@davemloft.net>2012-07-05 06:06:44 -0400
commit90b1ebe7af2592597e7568bb203d59f4918f76ad (patch)
tree82e02f0900e50634b991622b77b3406fd40a4c54
parent16917b87a23b429226527f393270047069d665e9 (diff)
mlx4: set maximal number of default RSS queues
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Cc: Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index a0313de122de..14d9c762b60f 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -41,6 +41,7 @@
41#include <linux/slab.h> 41#include <linux/slab.h>
42#include <linux/io-mapping.h> 42#include <linux/io-mapping.h>
43#include <linux/delay.h> 43#include <linux/delay.h>
44#include <linux/netdevice.h>
44 45
45#include <linux/mlx4/device.h> 46#include <linux/mlx4/device.h>
46#include <linux/mlx4/doorbell.h> 47#include <linux/mlx4/doorbell.h>
@@ -1539,8 +1540,8 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
1539 struct mlx4_priv *priv = mlx4_priv(dev); 1540 struct mlx4_priv *priv = mlx4_priv(dev);
1540 struct msix_entry *entries; 1541 struct msix_entry *entries;
1541 int nreq = min_t(int, dev->caps.num_ports * 1542 int nreq = min_t(int, dev->caps.num_ports *
1542 min_t(int, num_online_cpus() + 1, MAX_MSIX_P_PORT) 1543 min_t(int, netif_get_num_default_rss_queues() + 1,
1543 + MSIX_LEGACY_SZ, MAX_MSIX); 1544 MAX_MSIX_P_PORT) + MSIX_LEGACY_SZ, MAX_MSIX);
1544 int err; 1545 int err;
1545 int i; 1546 int i;
1546 1547