[PATCH 0/2]netxen: tx timeout fix

[PATCH 0/2]netxen: tx timeout fix

[Amit Kumar Salecha]

Hi
  Series of 2 patches to fix tx timeout recovery and
  null pointer exception while cleaning resources.

  Plz apply these to net-2.6 tree.

Thanks
Amit Salecha

[PATCH 1/2] netxen: fix tx timeout recovery for NX2031 chip

[Amit Kumar Salecha]

For NX2031, first try to scrub interrupt before requesting firmware
reset. Return statement was missing after scrubbbing interrupt.

Signed-off-by: Vernon Mauery <vernux@us.ibm.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
---
 drivers/net/netxen/netxen_nic_main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 9f9d608..5209095 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1941,7 +1941,7 @@ static void netxen_tx_timeout_task(struct work_struct *work)
 		netif_wake_queue(adapter->netdev);
 
 		clear_bit(__NX_RESETTING, &adapter->state);
-
+		return;
 	} else {
 		clear_bit(__NX_RESETTING, &adapter->state);
 		if (!netxen_nic_reset_context(adapter)) {
-- 
1.5.6.1

[PATCH 2/2] netxen: protect resource cleanup by rtnl lock

[Amit Kumar Salecha]

o context resources can be in used, while resource cleanup is in progress,
  during fw recover.
o Null pointer execption can occur in send_cmd_desc, if fw recovery
  module frees tx ring without rtnl lock.
o Same applies to ethtool register dump.

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
---
 drivers/net/netxen/netxen_nic_main.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 5209095..24279e6 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -2240,7 +2240,9 @@ netxen_detach_work(struct work_struct *work)
 
 	netxen_nic_down(adapter, netdev);
 
+	rtnl_lock();
 	netxen_nic_detach(adapter);
+	rtnl_unlock();
 
 	status = NXRD32(adapter, NETXEN_PEG_HALT_STATUS1);
 
-- 
1.5.6.1

Re: [PATCH 0/2]netxen: tx timeout fix

[David Miller]

From: Amit Kumar Salecha <amit.salecha@qlogic.com>
Date: Tue,  2 Feb 2010 06:16:19 -0800

> Hi
>   Series of 2 patches to fix tx timeout recovery and
>   null pointer exception while cleaning resources.
> 
>   Plz apply these to net-2.6 tree.

Both applied, thank you.