GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 23:21:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	net/ipv4/Kconfig
	net/ipv4/tcp_timer.c
This commit is contained in:
David S. Miller 2010-10-04 11:56:38 -07:00
commit 21a180cda0
21 changed files with 124 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/ipv4/route.c
View file

@ -1232,7 +1232,7 @@ restart:
}
if (net_ratelimit())
printk(KERN_WARNING "Neighbour table overflow.\n");
printk(KERN_WARNING "ipv4: Neighbour table overflow.\n");
rt_drop(rt);
return -ENOBUFS;
}