diff options
| author |   Amit Kumar Salecha <amit.salecha@qlogic.com> | 2009-12-08 20:40:55 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-12-23 14:13:26 -0800 |
| commit | 6a808c6c02fb9f0ffa24ac7cca6cfc323cf98b21 (patch) | |
| tree | 8a9a6b881912a55568cc3b6839ee9a42449d0a23 /drivers/net/netxen/netxen_nic_init.c | |
| parent | netxen: minor suspend resume fixes (diff) | |
| download | linux-dev-6a808c6c02fb9f0ffa24ac7cca6cfc323cf98b21.tar.xz linux-dev-6a808c6c02fb9f0ffa24ac7cca6cfc323cf98b21.zip | |
netxen: fix tx timeout recovery
o In case of tx timeout, firmare may be healthy, but some pci-func may
see no response from it. Force firmware reset, if some pci-func
explicitly requests so.
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_init.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index 02f8d4b4db63..ba62411f3532 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c @@ -778,6 +778,9 @@ netxen_need_fw_reset(struct netxen_adapter *adapter) if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) return 1; + if (adapter->need_fw_reset) + return 1; + /* last attempt had failed */ if (NXRD32(adapter, CRB_CMDPEG_STATE) == PHAN_INITIALIZE_FAILED) return 1; |