diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-08 15:16:52 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-08 15:16:52 -0500 |
| commit | 3fb17dabf663216b90076f7a1649b599e90d46f1 (patch) | |
| tree | a2674336f0cf89d33eb5f919292cca8b05ec08fc /drivers/net/e1000e/netdev.c | |
| parent | e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0 (diff) | |
| parent | 310e5ca82a6f2e39b55eed1d9e3137c350f0b3b0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 1c18f26b0812..3065870cf2a7 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
| @@ -4309,7 +4309,6 @@ link_up: | |||
| 4309 | * to get done, so reset controller to flush Tx. | 4309 | * to get done, so reset controller to flush Tx. |
| 4310 | * (Do the reset outside of interrupt context). | 4310 | * (Do the reset outside of interrupt context). |
| 4311 | */ | 4311 | */ |
| 4312 | adapter->tx_timeout_count++; | ||
| 4313 | schedule_work(&adapter->reset_task); | 4312 | schedule_work(&adapter->reset_task); |
| 4314 | /* return immediately since reset is imminent */ | 4313 | /* return immediately since reset is imminent */ |
| 4315 | return; | 4314 | return; |