From 478d90750350c5b0f7f6018123f5ff8d6676d419 Mon Sep 17 00:00:00 2001 From: Amit Kumar Salecha Date: Wed, 21 Oct 2009 19:39:02 +0000 Subject: [PATCH] --- yaml --- r: 167929 b: refs/heads/master c: ff8a306d63a01f15f166039de94c448c76140d1d h: refs/heads/master i: 167927: d3ae746add9331750b5c57c1cd1c0221f39057cb v: v3 --- [refs] | 2 +- trunk/drivers/net/netxen/netxen_nic_main.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3486fe4748e1..fb85225d747e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8bee0a91dd2f472d51dc107288c988ae0a0f371a +refs/heads/master: ff8a306d63a01f15f166039de94c448c76140d1d diff --git a/trunk/drivers/net/netxen/netxen_nic_main.c b/trunk/drivers/net/netxen/netxen_nic_main.c index 7fc15e9e8adb..0b4a56a8c8d5 100644 --- a/trunk/drivers/net/netxen/netxen_nic_main.c +++ b/trunk/drivers/net/netxen/netxen_nic_main.c @@ -1919,6 +1919,7 @@ static void netxen_tx_timeout_task(struct work_struct *work) request_reset: adapter->need_fw_reset = 1; + clear_bit(__NX_RESETTING, &adapter->state); } struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)