---

yaml --- r: 167929 b: refs/heads/master c: ff8a306 h: refs/heads/master i: 167927: d3ae746 v: v3
git-mirror · Oct 23, 2009 · 478d907 · 478d907
1 parent 331f998
commit 478d907
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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)