diff options
-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) | |||
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 | ||
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 { | |||
794 | 794 | ||
795 | struct net_device_stats stats; | 795 | struct net_device_stats stats; |
796 | int high_dma_flag; | 796 | int high_dma_flag; |
797 | int device_close_flag; | ||
798 | int device_enabled_once; | 797 | int device_enabled_once; |
799 | 798 | ||
800 | char name[60]; | 799 | char name[60]; |