diff options
| author | Colin Cross <ccross@android.com> | 2013-03-13 17:16:02 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2013-03-13 17:16:02 -0700 |
| commit | 0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f (patch) | |
| tree | 9bab760a750d9cf4504d92603ee7fc82beeb2e38 /net/ipv6/ip6_fib.c | |
| parent | a276def548828763cf5ac228adf8c1ca73f8d4d3 (diff) | |
| parent | e28c3f2b514b5581e15614f7cf976131092cf4b6 (diff) | |
| download | kernel_samsung_tuna-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.zip kernel_samsung_tuna-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.tar.gz kernel_samsung_tuna-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.tar.bz2 | |
Merge tag 'v3.0.68' into android-3.0
This is the 3.0.68 stable release
Conflicts:
kernel/cgroup.c
Change-Id: I067982d25e18e3a12de93a5eb6429b8829d7ca11
Diffstat (limited to 'net/ipv6/ip6_fib.c')
| -rw-r--r-- | net/ipv6/ip6_fib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 0f9b37a..320d91d 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -1586,7 +1586,8 @@ int __init fib6_init(void) if (ret) goto out_kmem_cache_create; - ret = __rtnl_register(PF_INET6, RTM_GETROUTE, NULL, inet6_dump_fib); + ret = __rtnl_register(PF_INET6, RTM_GETROUTE, NULL, inet6_dump_fib, + NULL); if (ret) goto out_unregister_subsys; out: |