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

Commit 146bd683 authored by Linas Vepstas's avatar Linas Vepstas Committed by Jeff Garzik
Browse files

s2io: add PCI error recovery support 



s2io cleanup suggestions, per discussion on mailing lists.

Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent d796fdb7

drivers/net/s2io.c

+0 −2
Original line number Diff line number Diff line
@@ -3970,7 +3970,6 @@ static int s2io_close(struct net_device *dev) 
	/* Reset card, kill tasklet and free Tx and Rx buffers. */

	s2io_card_down(sp);



	sp->device_close_flag = TRUE;	/* Device is shut down. */

	return 0;

}
@@ -8053,7 +8052,6 @@ static pci_ers_result_t s2io_io_error_detected(struct pci_dev *pdev, 
	if (netif_running(netdev)) {

		/* Bring down the card, while avoiding PCI I/O */

		do_s2io_card_down(sp, 0);

		sp->device_close_flag = TRUE;	/* Device is shut down. */

	}

	pci_disable_device(pdev);

drivers/net/s2io.h

+0 −1
Original line number Diff line number Diff line
@@ -794,7 +794,6 @@ struct s2io_nic { 


	struct net_device_stats stats;

	int high_dma_flag;

	int device_close_flag;

	int device_enabled_once;



	char name[60];