From: Dmitry Kravkov Date: Wed, 27 Mar 2013 08:56:10 +0000 (+0000) Subject: bnx2x: fix compilation without CONFIG_BNX2X_SRIOV X-Git-Tag: MMI-PSA29.97-13-9~14469^2~297 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8b49a4c75965ed157e21450d23dcadd6b27c1aa3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git bnx2x: fix compilation without CONFIG_BNX2X_SRIOV Move mutex initialization by allocation of the mailbox it protects. introduced in commit 1d6f3cd89 'bnx2x: Prevent VF race' Signed-off-by: Dmitry Kravkov Reported-by: kbuild test robot Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 10af03e43394..fdfe33bc097b 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 db63d8655fca..2ce7c7471367 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));