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/wireless/ath9k/core.c
	drivers/net/wireless/ath9k/main.c
	net/core/dev.c
This commit is contained in:
David S. Miller
2008-10-01 06:12:56 -07:00
parent 93c8b90f01 0523820482
commit b262e60309
327 changed files with 3187 additions and 2133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv6/route.c
View File

@@ -2708,6 +2708,8 @@ int __init ip6_route_init(void)
if (ret)
goto out_kmem_cache;
ip6_dst_blackhole_ops.kmem_cachep = ip6_dst_ops_template.kmem_cachep;
/* Registering of the loopback is done before this portion of code,
* the loopback reference in rt6_info will not be taken, do it
* manually for init_net */