[NETNS][ICMP]: Move ICMP sysctls on struct net.

Initialization is moved to icmp_sk_init, all the places, that
refer to them use init_net for now.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 6 deletions

diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index c2fca3024d2e..e9585c02f243 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -406,7 +406,7 @@ static struct ctl_table ipv4_table[] = {
         {
                 .ctl_name       = NET_IPV4_ICMP_ECHO_IGNORE_ALL,
                 .procname       = "icmp_echo_ignore_all",
-                .data           = &sysctl_icmp_echo_ignore_all,
+                .data           = &init_net.ipv4.sysctl_icmp_echo_ignore_all,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec
@@ -414,7 +414,7 @@ static struct ctl_table ipv4_table[] = {
         {
                 .ctl_name       = NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS,
                 .procname       = "icmp_echo_ignore_broadcasts",
-                .data           = &sysctl_icmp_echo_ignore_broadcasts,
+                .data           = &init_net.ipv4.sysctl_icmp_echo_ignore_broadcasts,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec
@@ -422,7 +422,7 @@ static struct ctl_table ipv4_table[] = {
         {
                 .ctl_name       = NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES,
                 .procname       = "icmp_ignore_bogus_error_responses",
-                .data           = &sysctl_icmp_ignore_bogus_error_responses,
+                .data           = &init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec
@@ -430,7 +430,7 @@ static struct ctl_table ipv4_table[] = {
         {
                 .ctl_name       = NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR,
                 .procname       = "icmp_errors_use_inbound_ifaddr",
-                .data           = &sysctl_icmp_errors_use_inbound_ifaddr,
+                .data           = &init_net.ipv4.sysctl_icmp_errors_use_inbound_ifaddr,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec
@@ -588,7 +588,7 @@ static struct ctl_table ipv4_table[] = {
         {
                 .ctl_name       = NET_IPV4_ICMP_RATELIMIT,
                 .procname       = "icmp_ratelimit",
-                .data           = &sysctl_icmp_ratelimit,
+                .data           = &init_net.ipv4.sysctl_icmp_ratelimit,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec
@@ -596,7 +596,7 @@ static struct ctl_table ipv4_table[] = {
         {
                 .ctl_name       = NET_IPV4_ICMP_RATEMASK,
                 .procname       = "icmp_ratemask",
-                .data           = &sysctl_icmp_ratemask,
+                .data           = &init_net.ipv4.sysctl_icmp_ratemask,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec