diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-14 12:01:33 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-14 12:01:33 (GMT) |
| commit | dad1e54b121d93ed47690d77736af63d3f11d657 (patch) | |
| tree | 36fdd29537e43bbb4f36252e010a591ae6fe20bc /drivers/net/e1000e | |
| parent | 1253332f75f3774cc84d0b7693152656848901f9 (diff) | |
| parent | 0110d6f22f392f976e84ab49da1b42f85b64a3c5 (diff) | |
| download | linux-fsl-qoriq-dad1e54b121d93ed47690d77736af63d3f11d657.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/pcmcia/smc91c92_cs.c
drivers/net/virtio_net.c
Diffstat (limited to 'drivers/net/e1000e')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 38390b5..1bd581e 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -664,6 +664,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) i = 0; } + if (i == tx_ring->next_to_use) + break; eop = tx_ring->buffer_info[i].next_to_watch; eop_desc = E1000_TX_DESC(*tx_ring, eop); } |