Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b49a4c7 authored by Dmitry Kravkov's avatar Dmitry Kravkov Committed by David S. Miller
Browse files

bnx2x: fix compilation without CONFIG_BNX2X_SRIOV 



Move mutex initialization by allocation of the mailbox it protects.

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

Signed-off-by: default avatarDmitry Kravkov <dmitry@broadcom.com>
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f3d40392

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c

+2 −0
Original line number Diff line number Diff line
@@ -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));