diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-27 04:03:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-27 04:03:26 -0400 |
| commit | cfadf853f6cd9689f79a63ca960c6f9d6665314f (patch) | |
| tree | 35418e342d9783f0974ea33ef03875aa21d2362a /drivers/net/netxen/netxen_nic_main.c | |
| parent | 05423b241311c9380b7280179295bac7794281b6 (diff) | |
| parent | f568a926a353d6816b3704d7367f34371df44ce7 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sh_eth.c
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 1071f090a124..c2bdfd3c7aad 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
| @@ -1925,6 +1925,7 @@ static void netxen_tx_timeout_task(struct work_struct *work) | |||
| 1925 | 1925 | ||
| 1926 | request_reset: | 1926 | request_reset: |
| 1927 | adapter->need_fw_reset = 1; | 1927 | adapter->need_fw_reset = 1; |
| 1928 | clear_bit(__NX_RESETTING, &adapter->state); | ||
| 1928 | } | 1929 | } |
| 1929 | 1930 | ||
| 1930 | struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev) | 1931 | struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev) |