diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-26 08:22:42 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-26 08:22:42 +0100 |
commit | 04488734806948624dabc4514f96f14cd75b9a50 (patch) | |
tree | 74f3a3c10a7177a5f86398b83ad7bf0569fe8b89 /drivers/net/tc35815.c | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/... (diff) | |
parent | net: bug fix for vlan + gro issue (diff) | |
download | linux-04488734806948624dabc4514f96f14cd75b9a50.tar.xz linux-04488734806948624dabc4514f96f14cd75b9a50.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/tc35815.c')
-rw-r--r-- | drivers/net/tc35815.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index d838d4015c63..a2c635ecdab8 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c @@ -1437,7 +1437,6 @@ static int tc35815_do_interrupt(struct net_device *dev, u32 status, int limit) /* Transmit complete. */ lp->lstats.tx_ints++; tc35815_txdone(dev); - netif_wake_queue(dev); if (ret < 0) ret = 0; } |