Commit 7347b03d authored Oct 20, 2006 by Linas Vepstas Committed by Jeff Garzik Oct 21, 2006

[PATCH] e1000: Reset all functions after a PCI error



During the handling of the PCI error recovery sequence, the current e1000
driver erroneously blocks a device reset for any but the first PCI
function.  It shouldn't -- this is a cut-n-paste error from a different
driver (which tolerated only one hardware reset per hardware card).

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Acked-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent 6f0f6d87

drivers/net/e1000/e1000_main.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -4914,10 +4914,6 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
		pci_enable_wake(pdev, PCI_D3hot, 0);
		pci_enable_wake(pdev, PCI_D3cold, 0);

		/* Perform card reset only on one instance of the card */
		if (PCI_FUNC (pdev->devfn) != 0)
		return PCI_ERS_RESULT_RECOVERED;

		e1000_reset(adapter);
		E1000_WRITE_REG(&adapter->hw, WUS, ~0);