diff options
author | Linas Vepstas <linas@austin.ibm.com> | 2007-05-14 19:41:41 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-07-08 22:16:38 -0400 |
commit | 146bd683cc160d728f1f62a6ddade8451801a8c3 (patch) | |
tree | 255159157469ec0e17c099d4ebcc889d9dde13c0 /drivers/net/s2io.c | |
parent | d796fdb708fc5b10112934cba43e832c36ce4923 (diff) |
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>
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 2 |
1 files changed, 0 insertions, 2 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) | |||
3970 | /* Reset card, kill tasklet and free Tx and Rx buffers. */ | 3970 | /* Reset card, kill tasklet and free Tx and Rx buffers. */ |
3971 | s2io_card_down(sp); | 3971 | s2io_card_down(sp); |
3972 | 3972 | ||
3973 | sp->device_close_flag = TRUE; /* Device is shut down. */ | ||
3974 | return 0; | 3973 | return 0; |
3975 | } | 3974 | } |
3976 | 3975 | ||
@@ -8053,7 +8052,6 @@ static pci_ers_result_t s2io_io_error_detected(struct pci_dev *pdev, | |||
8053 | if (netif_running(netdev)) { | 8052 | if (netif_running(netdev)) { |
8054 | /* Bring down the card, while avoiding PCI I/O */ | 8053 | /* Bring down the card, while avoiding PCI I/O */ |
8055 | do_s2io_card_down(sp, 0); | 8054 | do_s2io_card_down(sp, 0); |
8056 | sp->device_close_flag = TRUE; /* Device is shut down. */ | ||
8057 | } | 8055 | } |
8058 | pci_disable_device(pdev); | 8056 | pci_disable_device(pdev); |
8059 | 8057 | ||