xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	drivers/net/Kconfig
This commit is contained in:
David S. Miller
2009-02-03 00:15:35 -08:00
parent 1bded710a5 fb53fde976
commit b3ff29d2cc
583 changed files with 14384 additions and 6099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/tulip/de2104x.c
View File

@@ -392,7 +392,7 @@ static void de_rx (struct de_private *de)
unsigned drop = 0;
int rc;
while (rx_work--) {
while (--rx_work) {
u32 status, len;
dma_addr_t mapping;
struct sk_buff *skb, *copy_skb;