From 0031bc35d44874ee99a8a4e2e592a83f33a18468 Mon Sep 17 00:00:00 2001
From: Eilon Greenstein <eilong@broadcom.com>
Date: Mon, 9 Nov 2009 06:09:28 +0000
Subject: [PATCH] --- yaml --- r: 171479 b: refs/heads/master c:
 91545f6e588c601d1dff01d396155d973db83a31 h: refs/heads/master i:   171477:
 4956496ae71e69a7adb7d85ac766a7386e2d641e   171475:
 0a980735e3dfff96270da11f800275e705169344   171471:
 d5591ebf03c3bb1c9164d9dccdd528014d57b485 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/bnx2x_main.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e4806376640a..3983ff8fd24c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6a2f98b0128ad1225f959610ba21b6679b7cd96
+refs/heads/master: 91545f6e588c601d1dff01d396155d973db83a31
diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c
index 47d67e6aabcf..ed56973794e8 100644
--- a/trunk/drivers/net/bnx2x_main.c
+++ b/trunk/drivers/net/bnx2x_main.c
@@ -7486,11 +7486,6 @@ static int bnx2x_set_int_mode(struct bnx2x *bp)
 		rc = bnx2x_enable_msix(bp);
 		if (rc) {
 			/* failed to enable MSI-X */
-			if (bp->multi_mode)
-				BNX2X_ERR("Multi requested but failed to "
-					  "enable MSI-X (rx %d tx %d), "
-					  "set number of queues to 1\n",
-					  bp->num_rx_queues, bp->num_tx_queues);
 			bp->num_rx_queues = 1;
 			bp->num_tx_queues = 1;
 		}