|
@@ -1903,12 +1903,13 @@ static void netxen_tx_timeout_task(struct work_struct *work)
|
|
|
|
|
|
netif_wake_queue(adapter->netdev);
|
|
|
|
|
|
- goto done;
|
|
|
+ clear_bit(__NX_RESETTING, &adapter->state);
|
|
|
|
|
|
} else {
|
|
|
+ clear_bit(__NX_RESETTING, &adapter->state);
|
|
|
if (!netxen_nic_reset_context(adapter)) {
|
|
|
adapter->netdev->trans_start = jiffies;
|
|
|
- goto done;
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
/* context reset failed, fall through for fw reset */
|
|
@@ -1916,8 +1917,6 @@ static void netxen_tx_timeout_task(struct work_struct *work)
|
|
|
|
|
|
request_reset:
|
|
|
adapter->need_fw_reset = 1;
|
|
|
-done:
|
|
|
- clear_bit(__NX_RESETTING, &adapter->state);
|
|
|
}
|
|
|
|
|
|
struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)
|