From 9d0e2852d4f705ba0d5ae79897c887bbd6e16589 Mon Sep 17 00:00:00 2001
From: Vladislav Zolotarov <vladz@broadcom.com>
Date: Tue, 1 Feb 2011 14:05:30 -0800
Subject: [PATCH] --- yaml --- r: 232872 b: refs/heads/master c:
 d9c8f498c3b41e686d3306dcf01d95941fcc6b48 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/bnx2x/bnx2x_main.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 153a6e782bf1..e799dd74082f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f97f3057fd2febbd7f34a60f09a2cb9cef8bf403
+refs/heads/master: d9c8f498c3b41e686d3306dcf01d95941fcc6b48
diff --git a/trunk/drivers/net/bnx2x/bnx2x_main.c b/trunk/drivers/net/bnx2x/bnx2x_main.c
index 404d93e6df21..f40740e68ea5 100644
--- a/trunk/drivers/net/bnx2x/bnx2x_main.c
+++ b/trunk/drivers/net/bnx2x/bnx2x_main.c
@@ -2301,15 +2301,10 @@ static void bnx2x_rxq_set_mac_filters(struct bnx2x *bp, u16 cl_id, u32 filters)
 		/* accept matched ucast */
 		drop_all_ucast = 0;
 	}
-	if (filters & BNX2X_ACCEPT_MULTICAST) {
+	if (filters & BNX2X_ACCEPT_MULTICAST)
 		/* accept matched mcast */
 		drop_all_mcast = 0;
-		if (IS_MF_SI(bp))
-			/* since mcast addresses won't arrive with ovlan,
-			 * fw needs to accept all of them in
-			 * switch-independent mode */
-			accp_all_mcast = 1;
-	}
+
 	if (filters & BNX2X_ACCEPT_ALL_UNICAST) {
 		/* accept all mcast */
 		drop_all_ucast = 0;