tree 3ff96c8e234a81e1a021ddeabb65b32b1358cb08
parent a66b9ffdd96e8ae294f64186f45dd48523a33dcc
author Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> 1492658348 -0600
committer Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> 1492658991 -0600

net: ipv6: Fix sysctl registration error

accept_ra_rt_table was registered twice incorrectly due to a merge
conflict. This results in the following warning and fails all
IPv6 functionality.

[sysctl duplicate entry←: /net/ipv6/conf/all//accept_ra_rt_table
CPU←[: 2 PID: 1 Comm: swapper/0 Tainted: G        W     4.9.21+ #1
Call trace:
[<ffffff800808a2c4>] dump_backtrace+0x0/0x1fc
[<ffffff800808a768>] show_stack+0x20/0x28
[<ffffff80083de2c4>] dump_stack+0xb0/0xec
[<ffffff80082a2054>] __register_sysctl_table+0x3e4/0x674
[<ffffff8008ee17f0>] register_net_sysctl+0x30/0x3c
[<ffffff8008dcfa64>] __addrconf_sysctl_register+0xe8/0x17c
[<ffffff8008dd0174>] addrconf_init_net+0x9c/0x120
[<ffffff8008caf824>] ops_init+0x94/0x148
[<ffffff8008cb043c>] register_pernet_operations+0xfc/0x1a8
[<ffffff8008cb0520>] register_pernet_subsys+0x38/0x54
[<ffffff80096b2bfc>] addrconf_init+0x54/0x230
[<ffffff80096b2a28>] inet6_init+0x198/0x2f8
[<ffffff80080839ac>] do_one_initcall+0x54/0x160
[<ffffff8009650e38>] kernel_init_freeable+0x1cc/0x26c
[<ffffff8008ef55a4>] kernel_init+0x20/0x144
[<ffffff8008083690>] ret_from_fork+0x10/0x40

CRs-Fixed: 2036108
Change-Id: I804e9b6d188ab1a723cd6cc353338be52026dd2d
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>