lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/pcmcia/smc91c92_cs.c
	drivers/net/virtio_net.c
This commit is contained in:
David S. Miller
2010-04-14 05:01:33 -07:00
parent 1253332f75 0110d6f22f
commit dad1e54b12
8 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/e1000e/netdev.c
View File

@ -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);
}