diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-03 19:38:22 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-03 19:38:22 -0800 |
commit | 9c119ba54c0fcae72881948af3d37b47a2f8e1f9 (patch) | |
tree | 0be51b0bf02ece3bb32955e9d33a3998ecd57250 /drivers/net/netxen | |
parent | a4b97f2054af2e411c414ed4cb5e1d0dbfd24a47 (diff) | |
parent | fdd3d631cddad20ad9d3e1eb7dbf26825a8a121f (diff) | |
download | lwn-9c119ba54c0fcae72881948af3d37b47a2f8e1f9.tar.gz lwn-9c119ba54c0fcae72881948af3d37b47a2f8e1f9.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/netxen')
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 076f826d5a50..08780ef1c1f8 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -1995,7 +1995,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)) { @@ -2323,7 +2323,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); |