netxen: fix tx timeout recovery

Redesign tx timeout handling in line with new firmware
reset design that co-ordinates with other PCI function
drivers.

o For NX3031, first try to reset PCI function's own
  context before requesting firmware reset.

o For NX2031, since firmware heartbit is not supported
  directly request firmware reset.

Signed-off-by: Amit Kumar Salecha <amit@netxen.com>
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 8926b0e0c8bc..128d1b65402d 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -1434,8 +1434,10 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter)
 
                 if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev)) {
                         __netif_tx_lock(tx_ring->txq, smp_processor_id());
-                        if (netxen_tx_avail(tx_ring) > TX_STOP_THRESH)
+                        if (netxen_tx_avail(tx_ring) > TX_STOP_THRESH) {
                                 netif_wake_queue(netdev);
+                                adapter->tx_timeo_cnt = 0;
+                        }
                         __netif_tx_unlock(tx_ring->txq);
                 }
         }