---

yaml --- r: 351391 b: refs/heads/master c: f72839d h: refs/heads/master i: 351389: 0d4713b 351387: 662356c 351383: 55aca72 351375: e5e3d94 351359: 69dc762 v: v3
git-mirror · Jan 15, 2013 · cdc021a · cdc021a
1 parent 6c3e9b5
commit cdc021a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);