Re: [PATCH 2/2] s2io: add PCI error recovery support

[Linas Vepstas]

s2io cleanup suggestions, per discussion on mailing lists.

Signed-off-by: Linas Vepstas <linas@xxxxxxxxxxxxxx>

----
 drivers/net/s2io.c |    2 --
 drivers/net/s2io.h |    1 -
 2 files changed, 3 deletions(-)

Index: linux-2.6.22-rc1/drivers/net/s2io.c
===================================================================
--- linux-2.6.22-rc1.orig/drivers/net/s2io.c	2007-05-14 17:23:45.000000000 -0500
+++ linux-2.6.22-rc1/drivers/net/s2io.c	2007-05-14 17:24:03.000000000 -0500
@@ -3980,7 +3980,6 @@ static int s2io_close(struct net_device 
 	/* 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;
 }
 
@@ -8063,7 +8062,6 @@ static pci_ers_result_t s2io_io_error_de
 	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);
 
Index: linux-2.6.22-rc1/drivers/net/s2io.h
===================================================================
--- linux-2.6.22-rc1.orig/drivers/net/s2io.h	2007-05-14 17:23:45.000000000 -0500
+++ linux-2.6.22-rc1/drivers/net/s2io.h	2007-05-14 17:24:03.000000000 -0500
@@ -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 linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/