diff options
| author |   Amit Kumar Salecha <amit@qlogic.com> | 2009-09-11 11:28:14 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-09-11 16:58:48 -0700 |
| commit | 74c520da5414d15b0ab2839d67efab2e7227be75 (patch) | |
| tree | d079968ab0f36d4cf7521763ef64d165976537e7 /drivers/net/netxen/netxen_nic.h | |
| parent | netxen: fix file firmware leak (diff) | |
| download | linux-dev-74c520da5414d15b0ab2839d67efab2e7227be75.tar.xz linux-dev-74c520da5414d15b0ab2839d67efab2e7227be75.zip | |
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>
Diffstat (limited to 'drivers/net/netxen/netxen_nic.h')
| -rw-r--r-- | drivers/net/netxen/netxen_nic.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h index 7e3d2b932790..1ae46e8c2dc7 100644 --- a/drivers/net/netxen/netxen_nic.h +++ b/drivers/net/netxen/netxen_nic.h @@ -178,6 +178,7 @@ #define MAX_BUFFERS_PER_CMD 32 #define TX_STOP_THRESH ((MAX_SKB_FRAGS >> 2) + 4) +#define NX_MAX_TX_TIMEOUTS 2 /* * Following are the states of the Phantom. Phantom will set them and @@ -1145,7 +1146,8 @@ struct netxen_adapter { u8 link_changed; u8 fw_wait_cnt; u8 fw_fail_cnt; - u16 resv4; + u8 tx_timeo_cnt; + u8 need_fw_reset; u8 has_link_events; u8 fw_type; |