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: 856c395cfa63 ("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>

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index cd9033245b985bc62eceaccd329681cac84a5318..eb514f312e6fa3f3aa531914f2b4c9973cc3afc6 100644 (file)
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -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));
        }

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index da5a21050ba928917002ce0e12298512e6bf8795..4ae17a966ae3d714fdf711d847e4e3ca73458ec2 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -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));
        }