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

Commit a112fd4c authored by Ron Mercer's avatar Ron Mercer Committed by David S. Miller
Browse files

qlge: Move reset from eeh io_resume to slot_reset. 



Issue asic reset and verify functionality before continuing to the
resume call.  This allows proper error code to be returned in the case
the asic does not recover.

Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a0b9ca0

drivers/net/qlge/qlge_main.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -4717,6 +4717,12 @@ static pci_ers_result_t qlge_io_slot_reset(struct pci_dev *pdev) 
		return PCI_ERS_RESULT_DISCONNECT;

		return PCI_ERS_RESULT_DISCONNECT;

	}

	}

	pci_set_master(pdev);

	pci_set_master(pdev);



	if (ql_adapter_reset(qdev)) {

		QPRINTK(qdev, DRV, ERR, "reset FAILED!\n");

		return PCI_ERS_RESULT_DISCONNECT;

	}



	return PCI_ERS_RESULT_RECOVERED;

	return PCI_ERS_RESULT_RECOVERED;

}

}
@@ -4726,8 +4732,6 @@ static void qlge_io_resume(struct pci_dev *pdev) 
	struct ql_adapter *qdev = netdev_priv(ndev);

	struct ql_adapter *qdev = netdev_priv(ndev);

	int err = 0;

	int err = 0;





	if (ql_adapter_reset(qdev))

		QPRINTK(qdev, DRV, ERR, "reset FAILED!\n");

	if (netif_running(ndev)) {

	if (netif_running(ndev)) {

		err = qlge_open(ndev);

		err = qlge_open(ndev);

		if (err) {

		if (err) {