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

Commit a154d5d8 authored Mar 04, 2019 by Arnd Bergmann Committed by David S. Miller Mar 04, 2019

net: ignore sysctl_devconf_inherit_init_net without SYSCTL



When CONFIG_SYSCTL is turned off, we get a link failure for
the newly introduced tuning knob.

net/ipv6/addrconf.o: In function `addrconf_init_net':
addrconf.c:(.text+0x31dc): undefined reference to `sysctl_devconf_inherit_init_net'

Add an IS_ENABLED() check to fall back to the default behavior
(sysctl_devconf_inherit_init_net=0) here.

Fixes: 856c395c ("net: introduce a knob to control whether to inherit devconf config")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Christian Brauner <christian@brauner.io>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 64af7dc3

net/ipv4/devinet.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -2614,7 +2614,9 @@ static __net_init int devinet_init_net(struct net *net)
		tbl[0].extra2 = net;
		#endif

		if (sysctl_devconf_inherit_init_net != 2 && !net_eq(net, &init_net)) {
		if ((!IS_ENABLED(CONFIG_SYSCTL) \|\|
		sysctl_devconf_inherit_init_net != 2) &&
		!net_eq(net, &init_net)) {
		memcpy(all, init_net.ipv4.devconf_all, sizeof(ipv4_devconf));
		memcpy(dflt, init_net.ipv4.devconf_dflt, sizeof(ipv4_devconf_dflt));
		}

net/ipv6/addrconf.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -6905,7 +6905,8 @@ static int __net_init addrconf_init_net(struct net *net)
		if (!dflt)
		goto err_alloc_dflt;

		if (sysctl_devconf_inherit_init_net == 1 && !net_eq(net, &init_net)) {
		if (IS_ENABLED(CONFIG_SYSCTL) &&
		sysctl_devconf_inherit_init_net == 1 && !net_eq(net, &init_net)) {
		memcpy(all, init_net.ipv6.devconf_all, sizeof(ipv6_devconf));
		memcpy(dflt, init_net.ipv6.devconf_dflt, sizeof(ipv6_devconf_dflt));
		}