From: linas@austin.ibm.com (Linas Vepstas)
To: Jeff Garzik <jgarzik@pobox.com>
Cc: linux-pci@atrey.karlin.mff.cuni.cz, netdev@vger.kernel.org,
James.Bottomley@SteelEye.com, linux-kernel@vger.kernel.org,
Ramkrishna Vepa <Ramkrishna.Vepa@neterion.com>,
Raghavendra Koushik <raghavendra.koushik@neterion.com>,
Wen Xiong <wenxiong@us.ibm.com>
Subject: Re: [PATCH 2/2] s2io: add PCI error recovery support
Date: Mon, 14 May 2007 18:41:41 -0500 [thread overview]
Message-ID: <20070514234141.GB4511@austin.ibm.com> (raw)
In-Reply-To: <20070514233730.GA4511@austin.ibm.com>
s2io cleanup suggestions, per discussion on mailing lists.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
----
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];
next prev parent reply other threads:[~2007-05-14 23:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-14 23:37 [PATCH 1/2] s2io: add PCI error recovery support Linas Vepstas
2007-05-14 23:41 ` Linas Vepstas [this message]
2007-05-14 23:42 ` Linas Vepstas
2007-05-18 7:06 ` Sivakumar Subramani
2007-05-21 17:07 ` Linas Vepstas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070514234141.GB4511@austin.ibm.com \
--to=linas@austin.ibm.com \
--cc=James.Bottomley@SteelEye.com \
--cc=Ramkrishna.Vepa@neterion.com \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@atrey.karlin.mff.cuni.cz \
--cc=netdev@vger.kernel.org \
--cc=raghavendra.koushik@neterion.com \
--cc=wenxiong@us.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).