From cdc021acde2da2649360fceb6459bcb03df7c9ec Mon Sep 17 00:00:00 2001
From: Dmitry Kravkov <dmitry@broadcom.com>
Date: Mon, 14 Jan 2013 05:11:43 +0000
Subject: [PATCH] --- yaml --- r: 351391 b: refs/heads/master c:
 f72839d036d5ae7db43772224eb33608bcb9b5f5 h: refs/heads/master i:   351389:
 0d4713b7ccff4ceb63acadecdd4adea53ab4a714   351387:
 662356ca9ac0bbd3cc3f590bce6d2bae1d9dfca8   351383:
 55aca72984199304f27d34e15bf392b429a2e04e   351375:
 e5e3d94cce0f526f9148e00fdba1b8fafacb3413   351359:
 69dc7623760bee4f15a3096616a328cb80df3c19 v: v3

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

diff --git a/[refs] b/[refs]
index 2d160ba03550..697dca34f751 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c14a09b785d611b3d4a6457aff1fe194780eca25
+refs/heads/master: f72839d036d5ae7db43772224eb33608bcb9b5f5
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 6578e410cee0..4c91f3bf4d3b 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -10789,7 +10789,7 @@ static void bnx2x_get_cnic_mac_hwinfo(struct bnx2x *bp)
 			/* Zero primary MAC configuration */
 			memset(bp->dev->dev_addr, 0, ETH_ALEN);
 
-		if (IS_MF_FCOE_AFEX(bp))
+		if (IS_MF_FCOE_AFEX(bp) || IS_MF_FCOE_SD(bp))
 			/* use FIP MAC as primary MAC */
 			memcpy(bp->dev->dev_addr, fip_mac, ETH_ALEN);