[PATCH] s2io: fixing a ethtool test that is broken

[PATCH] s2io: fixing a ethtool test that is broken

[leitao]

Due commit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff, it is not more
possible to pci_restore_state() more than once without calling
pci_save_state() in the middle.

Actually running a ethtool test on s2io makes the card inactive, 
and it needs to unload/reload the module to fix. 

This patch just save the state just after it restore in order to
keep the old behaviour

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
---
 drivers/net/s2io.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index ddccf5f..0dd7839 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3494,6 +3494,7 @@ static void s2io_reset(struct s2io_nic *sp)
 
 		/* Restore the PCI state saved during initialization. */
 		pci_restore_state(sp->pdev);
+		pci_save_state(sp->pdev);
 		pci_read_config_word(sp->pdev, 0x2, &val16);
 		if (check_pci_device_id(val16) != (u16)PCI_ANY_ID)
 			break;
-- 
1.6.0.2

RE: [PATCH] s2io: fixing a ethtool test that is broken

[Sivakumar Subramani]

[Siva] Reviewed the patch. Please accept it.

Acked-by: Sivakumar Subramani <sivakumar.subramani@neterion.com>

-----Original Message-----
From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]
On Behalf Of leitao@linux.vnet.ibm.com
Sent: Tuesday, November 10, 2009 11:44 AM
To: netdev@vger.kernel.org
Cc: Sreenivasa Honnur; Breno Leitao
Subject: [PATCH] s2io: fixing a ethtool test that is broken

Due commit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff, it is not more
possible to pci_restore_state() more than once without calling
pci_save_state() in the middle.

Actually running a ethtool test on s2io makes the card inactive, 
and it needs to unload/reload the module to fix. 

This patch just save the state just after it restore in order to
keep the old behaviour

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
---
 drivers/net/s2io.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index ddccf5f..0dd7839 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3494,6 +3494,7 @@ static void s2io_reset(struct s2io_nic *sp)
 
 		/* Restore the PCI state saved during initialization. */
 		pci_restore_state(sp->pdev);
+		pci_save_state(sp->pdev);
 		pci_read_config_word(sp->pdev, 0x2, &val16);
 		if (check_pci_device_id(val16) != (u16)PCI_ANY_ID)
 			break;
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] s2io: fixing a ethtool test that is broken

[David Miller]

From: "Sivakumar Subramani" <Sivakumar.Subramani@neterion.com>
Date: Thu, 12 Nov 2009 13:59:53 -0500

> [Siva] Reviewed the patch. Please accept it.
> 
> Acked-by: Sivakumar Subramani <sivakumar.subramani@neterion.com>

Please use reasonable mechanisms to reply to patches when you review
them.  Something in your mail client software or elsewhere has messed
with the Message-Id and other elements of the email headers, and
therefore the threading of messages so that patchwork and other tools
can attach your reply to the patch posting itself simply do not work.

This makes more work for me and I am not going to go searching for
your replies by hand.

So you should fix this because otherwise your review reply ACKs
will get lost.

Also you have this very non-standard way to attributing your content
by adding these "[Name]" tags.  Please don't do that, it is
non-standard and therefore most people don't understand it at all.

The normal email reply quoting mechanisms of your email client will
let us know exactly what parts are written by you, and what parts are
said by other people in quoted text.

Thank you.

Re: [PATCH] s2io: fixing a ethtool test that is broken

[David Miller]

From: leitao@linux.vnet.ibm.com
Date: Tue, 10 Nov 2009 14:44:23 -0500

> Due commit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff, it is not more
> possible to pci_restore_state() more than once without calling
> pci_save_state() in the middle.
> 
> Actually running a ethtool test on s2io makes the card inactive, 
> and it needs to unload/reload the module to fix. 
> 
> This patch just save the state just after it restore in order to
> keep the old behaviour
> 
> Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>

Applied.