diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2019-03-04 21:38:03 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-03-04 13:14:34 -0800 |
| commit | a154d5d83d21af6b9ee32adc5dbcea5ac1fb534c (patch) | |
| tree | 742a25ce5320613044083249ba3571eb0899f061 /net/ipv4/devinet.c | |
| parent | phy: mdio-mux: fix Kconfig dependencies (diff) | |
| download | linux-dev-a154d5d83d21af6b9ee32adc5dbcea5ac1fb534c.tar.xz linux-dev-a154d5d83d21af6b9ee32adc5dbcea5ac1fb534c.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/devinet.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index cd9033245b98..eb514f312e6f 100644 --- 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)); } |