[PATCH net-next] bnx2x: fix compilation without CONFIG_BNX2X_SRIOV

[PATCH net-next] bnx2x: fix compilation without CONFIG_BNX2X_SRIOV

[Dmitry Kravkov]

Move mutex initialization by allocation of the mailbox it protects.

introduced in commit 1d6f3cd89 'bnx2x: Prevent VF race'

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Reported-by: kbuild test robot <fengguang.wu@intel.com>

---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c  |    1 -
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 10af03e..fdfe33b 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -12522,7 +12522,6 @@ static int bnx2x_init_one(struct pci_dev *pdev,
 	 */
 	if (IS_VF(bp)) {
 		bp->doorbells = bnx2x_vf_doorbells(bp);
-		mutex_init(&bp->vf2pf_mutex);
 		rc = bnx2x_vf_pci_alloc(bp);
 		if (rc)
 			goto init_one_exit;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index db63d86..2ce7c74 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -3425,6 +3425,8 @@ void __iomem *bnx2x_vf_doorbells(struct bnx2x *bp)
 
 int bnx2x_vf_pci_alloc(struct bnx2x *bp)
 {
+	mutex_init(&bp->vf2pf_mutex);
+
 	/* allocate vf2pf mailbox for vf to pf channel */
 	BNX2X_PCI_ALLOC(bp->vf2pf_mbox, &bp->vf2pf_mbox_mapping,
 			sizeof(struct bnx2x_vf_mbx_msg));
-- 
1.7.7.2

Re: [PATCH net-next] bnx2x: fix compilation without CONFIG_BNX2X_SRIOV

[David Miller]

From: "Dmitry Kravkov" <dmitry@broadcom.com>
Date: Wed, 27 Mar 2013 20:56:10 +0200

> Move mutex initialization by allocation of the mailbox it protects.
> 
> introduced in commit 1d6f3cd89 'bnx2x: Prevent VF race'
> 
> Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
> Reported-by: kbuild test robot <fengguang.wu@intel.com>

Applied, thanks.