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

Commit 02481bc6 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnx2: Handle error condition in ->slot_reset() 



by closing the device if necessary.  Otherwise, since NAPI state is
already disabled, a subsequent close will hang the system.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5721f943

drivers/net/ethernet/broadcom/bnx2.c

+10 −5
Original line number Diff line number Diff line
@@ -8694,14 +8694,13 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev) 
{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct bnx2 *bp = netdev_priv(dev);

	pci_ers_result_t result;

	int err;

	pci_ers_result_t result = PCI_ERS_RESULT_DISCONNECT;

	int err = 0;



	rtnl_lock();

	if (pci_enable_device(pdev)) {

		dev_err(&pdev->dev,

			"Cannot re-enable PCI device after reset\n");

		result = PCI_ERS_RESULT_DISCONNECT;

	} else {

		pci_set_master(pdev);

		pci_restore_state(pdev);
@@ -8709,10 +8708,16 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev) 


		if (netif_running(dev)) {

			bnx2_set_power_state(bp, PCI_D0);

			bnx2_init_nic(bp, 1);

			err = bnx2_init_nic(bp, 1);

		}

		if (!err)

			result = PCI_ERS_RESULT_RECOVERED;

	}



	if (result != PCI_ERS_RESULT_RECOVERED && netif_running(dev)) {

		bnx2_napi_enable(bp);

		dev_close(dev);

	}

	rtnl_unlock();



	if (!(bp->flags & BNX2_FLAG_AER_ENABLED))