aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/sysctl_net_ipv6.c
diff options
context:
space:
mode:
authorDaniel Lezcano <dlezcano@fr.ibm.com>2008-01-10 05:47:55 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:01:14 -0500
commit291480c09a9452a3d8852a9bfeb5ba2cbcfe662c (patch)
tree63c12518256759295e529d13787939b8ae17438b /net/ipv6/sysctl_net_ipv6.c
parent50dd79653e295ce40da38c03bbfb5966aa1c1598 (diff)
[NETNS][IPV6]: Make ipv6_sysctl_register to return a value.
This patch makes the function ipv6_sysctl_register to return a value. The af_inet6 init function is now able to handle an error and catch it from the initialization of the sysctl. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/sysctl_net_ipv6.c')
-rw-r--r--net/ipv6/sysctl_net_ipv6.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index 4ad8d9d3cb7a..f713fbf34c23 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -91,10 +91,15 @@ EXPORT_SYMBOL_GPL(net_ipv6_ctl_path);
91 91
92static struct ctl_table_header *ipv6_sysctl_header; 92static struct ctl_table_header *ipv6_sysctl_header;
93 93
94void ipv6_sysctl_register(void) 94int ipv6_sysctl_register(void)
95{ 95{
96 ipv6_sysctl_header = register_sysctl_paths(net_ipv6_ctl_path, 96 ipv6_sysctl_header = register_sysctl_paths(net_ipv6_ctl_path,
97 ipv6_table); 97 ipv6_table);
98 if (!ipv6_sysctl_header)
99 return -ENOMEM;
100
101 return 0;
102
98} 103}
99 104
100void ipv6_sysctl_unregister(void) 105void ipv6_sysctl_unregister(void)