Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3954b8ac authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: ipv6: Fix sysctl registration error" into msm-4.9

parents ce37527d c0921495

net/ipv6/addrconf.c

+0 −7
Original line number Diff line number Diff line
@@ -5978,13 +5978,6 @@ static const struct ctl_table addrconf_sysctl[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "accept_ra_rt_table",

		.data		= &ipv6_devconf.accept_ra_rt_table,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

#ifdef CONFIG_IPV6_OPTIMISTIC_DAD

	{

		.procname	= "optimistic_dad",