diff options
Diffstat (limited to 'net/ipv4/devinet.c')
-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) | |||
2614 | tbl[0].extra2 = net; | 2614 | tbl[0].extra2 = net; |
2615 | #endif | 2615 | #endif |
2616 | 2616 | ||
2617 | if (sysctl_devconf_inherit_init_net != 2 && !net_eq(net, &init_net)) { | 2617 | if ((!IS_ENABLED(CONFIG_SYSCTL) || |
2618 | sysctl_devconf_inherit_init_net != 2) && | ||
2619 | !net_eq(net, &init_net)) { | ||
2618 | memcpy(all, init_net.ipv4.devconf_all, sizeof(ipv4_devconf)); | 2620 | memcpy(all, init_net.ipv4.devconf_all, sizeof(ipv4_devconf)); |
2619 | memcpy(dflt, init_net.ipv4.devconf_dflt, sizeof(ipv4_devconf_dflt)); | 2621 | memcpy(dflt, init_net.ipv4.devconf_dflt, sizeof(ipv4_devconf_dflt)); |
2620 | } | 2622 | } |