Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759396AbXENXl5 (ORCPT ); Mon, 14 May 2007 19:41:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754478AbXENXls (ORCPT ); Mon, 14 May 2007 19:41:48 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:41618 "EHLO e34.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754462AbXENXlr (ORCPT ); Mon, 14 May 2007 19:41:47 -0400 Date: Mon, 14 May 2007 18:41:41 -0500 To: Jeff Garzik Cc: linux-pci@atrey.karlin.mff.cuni.cz, netdev@vger.kernel.org, James.Bottomley@SteelEye.com, linux-kernel@vger.kernel.org, Ramkrishna Vepa , Raghavendra Koushik , Wen Xiong Subject: Re: [PATCH 2/2] s2io: add PCI error recovery support Message-ID: <20070514234141.GB4511@austin.ibm.com> References: <20070514233730.GA4511@austin.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070514233730.GA4511@austin.ibm.com> User-Agent: Mutt/1.5.11 From: linas@austin.ibm.com (Linas Vepstas) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1651 Lines: 47 s2io cleanup suggestions, per discussion on mailing lists. Signed-off-by: Linas Vepstas ---- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/