Skip to content

Commit

Permalink
s2io: add PCI error recovery support
Browse files Browse the repository at this point in the history
s2io cleanup suggestions, per discussion on mailing lists.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Linas Vepstas authored and Jeff Garzik committed Jul 9, 2007
1 parent d796fdb commit 146bd68
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 3 deletions.
2 changes: 0 additions & 2 deletions drivers/net/s2io.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);

Expand Down
1 change: 0 additions & 1 deletion drivers/net/s2io.h
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down

0 comments on commit 146bd68

Please sign in to comment.