aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x
diff options
context:
space:
mode:
authorVladislav Zolotarov <vladz@broadcom.com>2011-01-08 21:19:40 -0500
committerDavid S. Miller <davem@davemloft.net>2011-01-09 18:47:22 -0500
commit0744db2394ff1ee908169e38ab9308163c4cede5 (patch)
treeb0e9f60c6256a4e8eb6735ba1ef6d8c81c98607b /drivers/net/bnx2x
parent6a75da4a1a1d220fc3e32b816e83c258617505c5 (diff)
bnx2x: Don't prevent RSS configuration in INT#x and MSI interrupt modes.
Don't prevent RSS configuration in INT#x and MSI interrupt modes. Otherwise Rx hash key won't be available. Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x')
-rw-r--r--drivers/net/bnx2x/bnx2x_main.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 489a5512a04d..3866468aeb04 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -8751,13 +8751,6 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
8751 dev_err(&bp->pdev->dev, "MCP disabled, " 8751 dev_err(&bp->pdev->dev, "MCP disabled, "
8752 "must load devices in order!\n"); 8752 "must load devices in order!\n");
8753 8753
8754 /* Set multi queue mode */
8755 if ((multi_mode != ETH_RSS_MODE_DISABLED) &&
8756 ((int_mode == INT_MODE_INTx) || (int_mode == INT_MODE_MSI))) {
8757 dev_err(&bp->pdev->dev, "Multi disabled since int_mode "
8758 "requested is not MSI-X\n");
8759 multi_mode = ETH_RSS_MODE_DISABLED;
8760 }
8761 bp->multi_mode = multi_mode; 8754 bp->multi_mode = multi_mode;
8762 bp->int_mode = int_mode; 8755 bp->int_mode = int_mode;
8763 8756