From 65cd4961c9df2ac872dcbffc754621cbfd7cf610 Mon Sep 17 00:00:00 2001
From: Yuval Mintz <yuvalmin@broadcom.com>
Date: Sun, 1 Jul 2012 03:18:51 +0000
Subject: [PATCH] --- yaml --- r: 314983 b: refs/heads/master c:
 90b1ebe7af2592597e7568bb203d59f4918f76ad h: refs/heads/master i:   314981:
 5e782f039c0319b87de299841261ac54de2bb700   314979:
 213e39d3131bf8546262619d71b968cf15367bf0   314975:
 b2284f5919e118ed0c6aff960320b7621e715fca v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/ethernet/mellanox/mlx4/main.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dffc6c4b914d..74da3d2795fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16917b87a23b429226527f393270047069d665e9
+refs/heads/master: 90b1ebe7af2592597e7568bb203d59f4918f76ad
diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/main.c b/trunk/drivers/net/ethernet/mellanox/mlx4/main.c
index a0313de122de..14d9c762b60f 100644
--- a/trunk/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/trunk/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -41,6 +41,7 @@
 #include <linux/slab.h>
 #include <linux/io-mapping.h>
 #include <linux/delay.h>
+#include <linux/netdevice.h>
 
 #include <linux/mlx4/device.h>
 #include <linux/mlx4/doorbell.h>
@@ -1539,8 +1540,8 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
 	struct mlx4_priv *priv = mlx4_priv(dev);
 	struct msix_entry *entries;
 	int nreq = min_t(int, dev->caps.num_ports *
-			 min_t(int, num_online_cpus() + 1, MAX_MSIX_P_PORT)
-				+ MSIX_LEGACY_SZ, MAX_MSIX);
+			 min_t(int, netif_get_num_default_rss_queues() + 1,
+			       MAX_MSIX_P_PORT) + MSIX_LEGACY_SZ, MAX_MSIX);
 	int err;
 	int i;