[IPSEC]: Rename mode to outer_mode and add inner_mode

[linux-2.6-omap-h63xx.git] / net / ipv6 / sysctl_net_ipv6.c

diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index 8eff9fa1e983312b38926e1d5e3286d7474f84b6..68bb2548e469841ef139f79b7219f679e03179bc 100644 (file)
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -7,12 +7,12 @@
 
 #include <linux/mm.h>
 #include <linux/sysctl.h>
-#include <linux/config.h>
 #include <linux/in6.h>
 #include <linux/ipv6.h>
 #include <net/ndisc.h>
 #include <net/ipv6.h>
 #include <net/addrconf.h>
+#include <net/inet_frag.h>
 
 #ifdef CONFIG_SYSCTL
 
@@ -42,7 +42,7 @@ static ctl_table ipv6_table[] = {
        {
                .ctl_name       = NET_IPV6_IP6FRAG_HIGH_THRESH,
                .procname       = "ip6frag_high_thresh",
-               .data           = &sysctl_ip6frag_high_thresh,
+               .data           = &ip6_frags_ctl.high_thresh,
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec
@@ -50,7 +50,7 @@ static ctl_table ipv6_table[] = {
        {
                .ctl_name       = NET_IPV6_IP6FRAG_LOW_THRESH,
                .procname       = "ip6frag_low_thresh",
-               .data           = &sysctl_ip6frag_low_thresh,
+               .data           = &ip6_frags_ctl.low_thresh,
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec
@@ -58,7 +58,7 @@ static ctl_table ipv6_table[] = {
        {
                .ctl_name       = NET_IPV6_IP6FRAG_TIME,
                .procname       = "ip6frag_time",
-               .data           = &sysctl_ip6frag_time,
+               .data           = &ip6_frags_ctl.timeout,
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
@@ -67,7 +67,7 @@ static ctl_table ipv6_table[] = {
        {
                .ctl_name       = NET_IPV6_IP6FRAG_SECRET_INTERVAL,
                .procname       = "ip6frag_secret_interval",
-               .data           = &sysctl_ip6frag_secret_interval,
+               .data           = &ip6_frags_ctl.secret_interval,
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
@@ -93,7 +93,7 @@ static ctl_table ipv6_net_table[] = {
                .mode           = 0555,
                .child          = ipv6_table
        },
-        { .ctl_name = 0 }
+       { .ctl_name = 0 }
 };
 
 static ctl_table ipv6_root_table[] = {
@@ -103,12 +103,12 @@ static ctl_table ipv6_root_table[] = {
                .mode           = 0555,
                .child          = ipv6_net_table
        },
-        { .ctl_name = 0 }
+       { .ctl_name = 0 }
 };
 
 void ipv6_sysctl_register(void)
 {
-       ipv6_sysctl_header = register_sysctl_table(ipv6_root_table, 0);
+       ipv6_sysctl_header = register_sysctl_table(ipv6_root_table);
 }
 
 void ipv6_sysctl_unregister(void)