From 2676f4d251a52e2dd10b0acd4b4ddd47628f1c9a Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 5 Oct 2011 17:52:28 -0400
Subject: [PATCH] --- yaml --- r: 266439 b: refs/heads/master c:
 f0cd7bdc042310b6b104f133bbfd520a72b3c08a h: refs/heads/master i:   266437:
 091903c23be10cbbaa438ba5f6ea8cf652719825   266435:
 837979baf8157b1a872c6d9151071a24b03ccec7   266431:
 df022a0962a14a1632981dbea0c70bda4f4f85f8 v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 851bbef8b125..a074339b1817 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 011392224b4f6019c3b737f3dcb7c8f6fba41246
+refs/heads/master: f0cd7bdc042310b6b104f133bbfd520a72b3c08a
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 621ab281ed89..28bde1610ffb 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -4353,8 +4353,6 @@ static inline void bnx2x_handle_classification_eqe(struct bnx2x *bp,
 			vlan_mac_obj = &bp->fp[cid].mac_obj;
 
 		break;
-		vlan_mac_obj = &bp->fp[cid].mac_obj;
-
 	case BNX2X_FILTER_MCAST_PENDING:
 		/* This is only relevant for 57710 where multicast MACs are
 		 * configured as unicast MACs using the same ramrod.