The sysctl table definition and registration must be in the same file,
in order for the macro to work.
Add plumbing to register ipv6_{route,icmp}_table in their own files.
With this, ipv6_{route,icmp}_sysctl_table_size() can be removed.
Signed-off-by: Mauricio Faria de Oliveira <[email protected]>
---
include/net/ipv6.h | 6 ++++--
net/ipv6/icmp.c | 6 ++++--
net/ipv6/route.c | 10 +++++++---
net/ipv6/sysctl_net_ipv6.c | 10 ++--------
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index
3de07e738538f783e0fb4628c92ce50a7e36f9f5..29a095798abe8f5730ab0a046931ebf78f481bdf
100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -1220,9 +1220,11 @@ static inline int snmp6_unregister_dev(struct inet6_dev
*idev) { return 0; }
#ifdef CONFIG_SYSCTL
struct ctl_table *ipv6_icmp_sysctl_init(struct net *net);
-size_t ipv6_icmp_sysctl_table_size(void);
+struct ctl_table_header *ipv6_icmp_sysctl_register(struct net *net,
+ const struct ctl_table
*table);
struct ctl_table *ipv6_route_sysctl_init(struct net *net);
-size_t ipv6_route_sysctl_table_size(struct net *net);
+struct ctl_table_header *ipv6_route_sysctl_register(struct net *net,
+ const struct ctl_table
*table);
int ipv6_sysctl_register(void);
void ipv6_sysctl_unregister(void);
#endif
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index
a95b0351824f3237815e43bf8448110070955884..bb170b8c867c3c6eaccc41aab8ab1c65eb0aa24b
100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -1450,8 +1450,10 @@ struct ctl_table * __net_init
ipv6_icmp_sysctl_init(struct net *net)
return table;
}
-size_t ipv6_icmp_sysctl_table_size(void)
+struct ctl_table_header *ipv6_icmp_sysctl_register(struct net *net,
+ const struct ctl_table
*table)
{
- return ARRAY_SIZE(ipv6_icmp_table_template);
+ return register_net_sysctl(net, "net/ipv6/icmp", table,
+ ipv6_icmp_table_template);
}
#endif
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index
16dfac54a259a11410ba736535f0462070979276..9e3f849d3564f4312d7b64157471f50c8168aafd
100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -6698,13 +6698,17 @@ struct ctl_table * __net_init
ipv6_route_sysctl_init(struct net *net)
return table;
}
-size_t ipv6_route_sysctl_table_size(struct net *net)
+struct ctl_table_header *ipv6_route_sysctl_register(struct net *net,
+ const struct ctl_table
*table)
{
+ size_t table_size = ARRAY_SIZE(ipv6_route_table_template);
+
/* Don't export sysctls to unprivileged users */
if (net->user_ns != &init_user_ns)
- return 1;
+ table_size = 1;
- return ARRAY_SIZE(ipv6_route_table_template);
+ return register_net_sysctl_sz(net, "net/ipv6/route", table,
+ table_size, ipv6_route_table_template);
}
#endif
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index
75ba17cb7c0ccb4769d61e74220c75d0b3e2bcd9..88138fbd42b85d54d00cd15dfd7d6848ebabd607
100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -280,17 +280,11 @@ static int __net_init ipv6_sysctl_net_init(struct net
*net)
if (!net->ipv6.sysctl.hdr)
goto out_ipv6_icmp_table;
- net->ipv6.sysctl.route_hdr = register_net_sysctl_sz(net,
- "net/ipv6/route",
- ipv6_route_table,
-
ipv6_route_sysctl_table_size(net));
+ net->ipv6.sysctl.route_hdr = ipv6_route_sysctl_register(net,
ipv6_route_table);
if (!net->ipv6.sysctl.route_hdr)
goto out_unregister_ipv6_table;
- net->ipv6.sysctl.icmp_hdr = register_net_sysctl_sz(net,
- "net/ipv6/icmp",
- ipv6_icmp_table,
-
ipv6_icmp_sysctl_table_size());
+ net->ipv6.sysctl.icmp_hdr = ipv6_icmp_sysctl_register(net,
ipv6_icmp_table);
if (!net->ipv6.sysctl.icmp_hdr)
goto out_unregister_route_table;
--
2.47.3
