diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-26 02:22:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-26 02:22:42 -0500 |
| commit | 04488734806948624dabc4514f96f14cd75b9a50 (patch) | |
| tree | 74f3a3c10a7177a5f86398b83ad7bf0569fe8b89 /drivers/net/tc35815.c | |
| parent | 54831a83bfe656c4c54e287c734c6b0ccaa3719b (diff) | |
| parent | c4d49794ff2838038fd9756eae39c39a5a685833 (diff) | |
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) | |||
| 1437 | /* Transmit complete. */ | 1437 | /* Transmit complete. */ |
| 1438 | lp->lstats.tx_ints++; | 1438 | lp->lstats.tx_ints++; |
| 1439 | tc35815_txdone(dev); | 1439 | tc35815_txdone(dev); |
| 1440 | netif_wake_queue(dev); | ||
| 1441 | if (ret < 0) | 1440 | if (ret < 0) |
| 1442 | ret = 0; | 1441 | ret = 0; |
| 1443 | } | 1442 | } |