From e31530d75a9cb040f2202d688845b743ddcd0f16 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Mon, 14 May 2007 18:41:41 -0500 Subject: [PATCH] --- yaml --- r: 58352 b: refs/heads/master c: 146bd683cc160d728f1f62a6ddade8451801a8c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/s2io.c | 2 -- trunk/drivers/net/s2io.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 51c814cd0b5e..aa9f66dad632 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d796fdb708fc5b10112934cba43e832c36ce4923 +refs/heads/master: 146bd683cc160d728f1f62a6ddade8451801a8c3 diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c index 392ad4a42291..2d826fff7e2e 100644 --- a/trunk/drivers/net/s2io.c +++ b/trunk/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/trunk/drivers/net/s2io.h b/trunk/drivers/net/s2io.h index b9b660702abd..58592780f519 100644 --- a/trunk/drivers/net/s2io.h +++ b/trunk/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];