iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bnx2x: fix compilation without CONFIG_BNX2X_SRIOV

Browse Source 
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>
This commit is contained in:
Dmitry Kravkov 2013-03-27 08:56:10 +00:00 committed by David S. Miller
parent f3d4039242
commit 8b49a4c759
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
View File

@ -12522,7 +12522,6 @@ static int bnx2x_init_one(struct pci_dev *pdev,
*/ */
if (IS_VF(bp)) { if (IS_VF(bp)) {
bp->doorbells = bnx2x_vf_doorbells(bp); bp->doorbells = bnx2x_vf_doorbells(bp);
mutex_init(&bp->vf2pf_mutex);
rc = bnx2x_vf_pci_alloc(bp); rc = bnx2x_vf_pci_alloc(bp);
if (rc) if (rc)
goto init_one_exit; goto init_one_exit;

2
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
View File

@ -3425,6 +3425,8 @@ void __iomem *bnx2x_vf_doorbells(struct bnx2x *bp)
int bnx2x_vf_pci_alloc(struct bnx2x *bp) int bnx2x_vf_pci_alloc(struct bnx2x *bp)
{ {
mutex_init(&bp->vf2pf_mutex);
/* allocate vf2pf mailbox for vf to pf channel */ /* allocate vf2pf mailbox for vf to pf channel */
BNX2X_PCI_ALLOC(bp->vf2pf_mbox, &bp->vf2pf_mbox_mapping, BNX2X_PCI_ALLOC(bp->vf2pf_mbox, &bp->vf2pf_mbox_mapping,
sizeof(struct bnx2x_vf_mbx_msg)); sizeof(struct bnx2x_vf_mbx_msg));