1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 7ed9cdfa115e..80982c38ae69 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -11406,7 +11406,7 @@ static int bnx2x_init_bp(struct bnx2x *bp)
                 if (rc)
                         return rc;
         } else {
-                random_ether_addr(bp->dev->dev_addr);
+                eth_zero_addr(bp->dev->dev_addr);
         }
 
         bnx2x_set_modes_bitmap(bp);
@@ -11865,6 +11865,10 @@ static int bnx2x_validate_addr(struct net_device *dev)
 {
         struct bnx2x *bp = netdev_priv(dev);
 
+        /* query the bulletin board for mac address configured by the PF */
+        if (IS_VF(bp))
+                bnx2x_sample_bulletin(bp);
+
         if (!bnx2x_is_valid_ether_addr(bp, dev->dev_addr)) {
                 BNX2X_ERR("Non-valid Ethernet address\n");
                 return -EADDRNOTAVAIL;