diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/addrconf.c | 4 | ||||
-rw-r--r-- | net/ipv6/netfilter/ip6_queue.c | 2 | ||||
-rw-r--r-- | net/ipv6/sysctl_net_ipv6.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 4702954bf0ac..34d80b4aaa04 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -4029,7 +4029,7 @@ static void addrconf_sysctl_register(struct inet6_dev *idev, struct ipv6_devconf | |||
4029 | t->addrconf_root_dir[0].child = t->addrconf_proto_dir; | 4029 | t->addrconf_root_dir[0].child = t->addrconf_proto_dir; |
4030 | t->addrconf_root_dir[0].de = NULL; | 4030 | t->addrconf_root_dir[0].de = NULL; |
4031 | 4031 | ||
4032 | t->sysctl_header = register_sysctl_table(t->addrconf_root_dir, 0); | 4032 | t->sysctl_header = register_sysctl_table(t->addrconf_root_dir); |
4033 | if (t->sysctl_header == NULL) | 4033 | if (t->sysctl_header == NULL) |
4034 | goto free_procname; | 4034 | goto free_procname; |
4035 | else | 4035 | else |
@@ -4114,7 +4114,7 @@ int __init addrconf_init(void) | |||
4114 | rtnetlink_links[PF_INET6] = inet6_rtnetlink_table; | 4114 | rtnetlink_links[PF_INET6] = inet6_rtnetlink_table; |
4115 | #ifdef CONFIG_SYSCTL | 4115 | #ifdef CONFIG_SYSCTL |
4116 | addrconf_sysctl.sysctl_header = | 4116 | addrconf_sysctl.sysctl_header = |
4117 | register_sysctl_table(addrconf_sysctl.addrconf_root_dir, 0); | 4117 | register_sysctl_table(addrconf_sysctl.addrconf_root_dir); |
4118 | addrconf_sysctl_register(NULL, &ipv6_devconf_dflt); | 4118 | addrconf_sysctl_register(NULL, &ipv6_devconf_dflt); |
4119 | #endif | 4119 | #endif |
4120 | 4120 | ||
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c index 58847d3b61e5..fdb30a5916e5 100644 --- a/net/ipv6/netfilter/ip6_queue.c +++ b/net/ipv6/netfilter/ip6_queue.c | |||
@@ -683,7 +683,7 @@ static int __init ip6_queue_init(void) | |||
683 | } | 683 | } |
684 | 684 | ||
685 | register_netdevice_notifier(&ipq_dev_notifier); | 685 | register_netdevice_notifier(&ipq_dev_notifier); |
686 | ipq_sysctl_header = register_sysctl_table(ipq_root_table, 0); | 686 | ipq_sysctl_header = register_sysctl_table(ipq_root_table); |
687 | 687 | ||
688 | status = nf_register_queue_handler(PF_INET6, &nfqh); | 688 | status = nf_register_queue_handler(PF_INET6, &nfqh); |
689 | if (status < 0) { | 689 | if (status < 0) { |
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c index 25e8e7783fee..3fb44277207b 100644 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c | |||
@@ -107,7 +107,7 @@ static ctl_table ipv6_root_table[] = { | |||
107 | 107 | ||
108 | void ipv6_sysctl_register(void) | 108 | void ipv6_sysctl_register(void) |
109 | { | 109 | { |
110 | ipv6_sysctl_header = register_sysctl_table(ipv6_root_table, 0); | 110 | ipv6_sysctl_header = register_sysctl_table(ipv6_root_table); |
111 | } | 111 | } |
112 | 112 | ||
113 | void ipv6_sysctl_unregister(void) | 113 | void ipv6_sysctl_unregister(void) |