diff options
| author | Linas Vepstas <linas@austin.ibm.com> | 2007-05-15 03:41:41 +0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-07-09 06:16:38 +0400 |
| commit | 146bd683cc160d728f1f62a6ddade8451801a8c3 (patch) | |
| tree | 255159157469ec0e17c099d4ebcc889d9dde13c0 | |
| parent | d796fdb708fc5b10112934cba43e832c36ce4923 (diff) | |
| download | linux-146bd683cc160d728f1f62a6ddade8451801a8c3.tar.xz | |
s2io: add PCI error recovery support
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>
| -rw-r--r-- | drivers/net/s2io.c | 2 | ||||
| -rw-r--r-- | drivers/net/s2io.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 392ad4a42291..2d826fff7e2e 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -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); diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h index b9b660702abd..58592780f519 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/s2io.h @@ -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]; |