diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-08 17:19:01 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-08 17:19:01 -0800 |
commit | 263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea (patch) | |
tree | 5ee497d530185d32421122729af86cf77d0dc649 /drivers/net/e1000e | |
parent | 8d13a2a9fb3e5e3f68e9d3ec0de3c8fcfa56a224 (diff) | |
parent | c69b90920a36b88ab0d649963d81355d865eeb05 (diff) | |
download | kernel_samsung_tuna-263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea.zip kernel_samsung_tuna-263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea.tar.gz kernel_samsung_tuna-263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea.tar.bz2 |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/netdev.c
Diffstat (limited to 'drivers/net/e1000e')
-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 5b916b0..6025d5f 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -4311,7 +4311,6 @@ link_up: * to get done, so reset controller to flush Tx. * (Do the reset outside of interrupt context). */ - adapter->tx_timeout_count++; schedule_work(&adapter->reset_task); /* return immediately since reset is imminent */ return; |