bnx2x: Avoid using zero MAC

Prevent bnx2x devices which are used mainly for storage from using zero
MAC addresses as their primary MAC address.

Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index f685d2e77fcb1f7c02dec47a0e964e631b9b1075..e5662a141451689e614c337ec437ec22e39cd23b 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -10832,14 +10832,12 @@ static void bnx2x_get_cnic_mac_hwinfo(struct bnx2x *bp)
                        }
                }
 
-               if (IS_MF_STORAGE_SD(bp))
-                       /* Zero primary MAC configuration */
-                       memset(bp->dev->dev_addr, 0, ETH_ALEN);
-
-               if (IS_MF_FCOE_AFEX(bp) || IS_MF_FCOE_SD(bp))
-                       /* use FIP MAC as primary MAC */
+               /* If this is a storage-only interface, use SAN mac as
+                * primary MAC. Notice that for SD this is already the case,
+                * as the SAN mac was copied from the primary MAC.
+                */
+               if (IS_MF_FCOE_AFEX(bp))
                        memcpy(bp->dev->dev_addr, fip_mac, ETH_ALEN);
-
        } else {
                val2 = SHMEM_RD(bp, dev_info.port_hw_config[port].
                                iscsi_mac_upper);