Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=146bd683cc160d728f1f62a6ddade8451801a8c3
Commit:     146bd683cc160d728f1f62a6ddade8451801a8c3
Parent:     d796fdb708fc5b10112934cba43e832c36ce4923
Author:     Linas Vepstas <[EMAIL PROTECTED]>
AuthorDate: Mon May 14 18:41:41 2007 -0500
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sun Jul 8 22:16:38 2007 -0400

    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]>
---
 drivers/net/s2io.c |    2 --
 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 392ad4a..2d826ff 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 b9b6607..5859278 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];
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to