---

yaml --- r: 58352 b: refs/heads/master c: 146bd68 h: refs/heads/master v: v3
git-mirror · Jul 9, 2007 · e31530d · e31530d
1 parent 21c818f
commit e31530d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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
@@ -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];