s2io: add PCI error recovery support

s2io cleanup suggestions, per discussion on mailing lists.

Signed-off-by: Linas Vepstas <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 392ad4a422913ecc0eb76caaa6d2d10de0ea1505..2d826fff7e2e9270c7dac931172ac2c726f6eae3 100644 (file)
--- 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 b9b660702abdb9dcd7754508408914d87f293808..58592780f5198b77cfb6517ada8b0db02450a7ce 100644 (file)
--- 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];