diff options
| author | Dmitry Kravkov <dmitry@broadcom.com> | 2013-03-27 08:56:10 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-27 23:26:14 -0400 |
| commit | 8b49a4c75965ed157e21450d23dcadd6b27c1aa3 (patch) | |
| tree | 96aac5b9ffe6f67da7570eaf61cef34795655794 | |
| parent | f3d4039242af92a9d93dee2fd9ae47066b20ca29 (diff) | |
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 <dmitry@broadcom.com>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 1 | ||||
| -rw-r--r-- | 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 10af03e4339..fdfe33bc097 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 db63d8655fc..2ce7c747136 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)); |