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/benet/be_cmds.h
	include/linux/sysctl.h
This commit is contained in:
David S. Miller
2010-01-10 22:55:03 -08:00
parent bdbec4b86e fa15e99b6b
commit d4a66e752d
91 changed files with 1110 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/niu.c
View File

@@ -2844,7 +2844,7 @@ static int tcam_wait_bit(struct niu *np, u64 bit)
break;
udelay(1);
}
if (limit < 0)
if (limit <= 0)
return -ENODEV;
return 0;