bnx2x: Prevent VF race

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / broadcom / bnx2x / bnx2x_main.c

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index f6e9d15e3835818d0ed947f930354a8c1f520a12..10af03e433949396e02c39a35bd8f8132d34ec12 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -12521,7 +12521,8 @@ static int bnx2x_init_one(struct pci_dev *pdev,
         * l2 connections.
         */
        if (IS_VF(bp)) {
-               bnx2x_vf_map_doorbells(bp);
+               bp->doorbells = bnx2x_vf_doorbells(bp);
+               mutex_init(&bp->vf2pf_mutex);
                rc = bnx2x_vf_pci_alloc(bp);
                if (rc)
                        goto init_one_exit;