* [PATCH 0/2]netxen: tx timeout fix
@ 2010-02-02 14:16 Amit Kumar Salecha
2010-02-02 14:16 ` [PATCH 1/2] netxen: fix tx timeout recovery for NX2031 chip Amit Kumar Salecha
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Amit Kumar Salecha @ 2010-02-02 14:16 UTC (permalink / raw)
To: davem; +Cc: netdev, dhananjay.phadke
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
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/2] netxen: fix tx timeout recovery for NX2031 chip
2010-02-02 14:16 [PATCH 0/2]netxen: tx timeout fix Amit Kumar Salecha
@ 2010-02-02 14:16 ` Amit Kumar Salecha
2010-02-02 14:16 ` [PATCH 2/2] netxen: protect resource cleanup by rtnl lock Amit Kumar Salecha
2010-02-04 3:15 ` [PATCH 0/2]netxen: tx timeout fix David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Amit Kumar Salecha @ 2010-02-02 14:16 UTC (permalink / raw)
To: davem; +Cc: netdev, dhananjay.phadke, Vernon Mauery
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] netxen: protect resource cleanup by rtnl lock
2010-02-02 14:16 [PATCH 0/2]netxen: tx timeout fix Amit Kumar Salecha
2010-02-02 14:16 ` [PATCH 1/2] netxen: fix tx timeout recovery for NX2031 chip Amit Kumar Salecha
@ 2010-02-02 14:16 ` Amit Kumar Salecha
2010-02-04 3:15 ` [PATCH 0/2]netxen: tx timeout fix David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Amit Kumar Salecha @ 2010-02-02 14:16 UTC (permalink / raw)
To: davem; +Cc: netdev, dhananjay.phadke
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2]netxen: tx timeout fix
2010-02-02 14:16 [PATCH 0/2]netxen: tx timeout fix Amit Kumar Salecha
2010-02-02 14:16 ` [PATCH 1/2] netxen: fix tx timeout recovery for NX2031 chip Amit Kumar Salecha
2010-02-02 14:16 ` [PATCH 2/2] netxen: protect resource cleanup by rtnl lock Amit Kumar Salecha
@ 2010-02-04 3:15 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2010-02-04 3:15 UTC (permalink / raw)
To: amit.salecha; +Cc: netdev, dhananjay.phadke
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-02-04 3:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-02 14:16 [PATCH 0/2]netxen: tx timeout fix Amit Kumar Salecha
2010-02-02 14:16 ` [PATCH 1/2] netxen: fix tx timeout recovery for NX2031 chip Amit Kumar Salecha
2010-02-02 14:16 ` [PATCH 2/2] netxen: protect resource cleanup by rtnl lock Amit Kumar Salecha
2010-02-04 3:15 ` [PATCH 0/2]netxen: tx timeout fix David Miller
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).