make ipv6_sysctl_register to return a value
Subsystems (3)
Subject: make ipv6_sysctl_register to return a value
From: Daniel Lezcano <[email protected]>
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.
--- include/net/ipv6.h | 2 +- net/ipv6/af_inet6.c | 5 ++++- net/ipv6/sysctl_net_ipv6.c | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-)
include/net/ipv6.h +1 -1
@@ -620,7 +620,7 @@ static inline int snmp6_unregister_dev(sextern ctl_table ipv6_route_table[];extern ctl_table ipv6_icmp_table[]; -extern void ipv6_sysctl_register (void ); +extern int ipv6_sysctl_register (void );extern void ipv6_sysctl_unregister (void );#endif
net/ipv6/af_inet6.c +4 -1
@@ -783,7 +783,9 @@ static int __init inet6_init(void)*/ #ifdef CONFIG_SYSCTL -ipv6_sysctl_register (); + err =ipv6_sysctl_register (); +if (err) + goto sysctl_fail;#endif err =icmpv6_init (&inet6_family_ops);if (err)
@@ -897,6 +899,7 @@ ndisc_fail: icmp_fail: #ifdef CONFIG_SYSCTLipv6_sysctl_unregister (); +sysctl_fail: #endifcleanup_ipv6_mibs (); out_unregister_sock:
net/ipv6/sysctl_net_ipv6.c +5 -1
@@ -90,9 +90,13 @@ static struct ctl_path ipv6_ctl_path[] =static struct ctl_table_header *ipv6_sysctl_header; -void ipv6_sysctl_register (void ) +int ipv6_sysctl_register (void ) { ipv6_sysctl_header =register_sysctl_paths (ipv6_ctl_path, ipv6_table); +if (!ipv6_sysctl_header) +return -ENOMEM ; + +return 0 ; }void ipv6_sysctl_unregister (void )
David Miller
maintainerWhy did you post this again? It's identical to patch 1/9 from the previous series you sent out.
This is confusing, since it makes me think you wanted me to perhaps do something different or update an already submitted patch.
Quoted 6 lines · David Miller
Why did you post this again? It's identical to patch 1/9 from the previous series you sent out.
This is confusing, since it makes me think you wanted me to perhaps do something different or update an already submitted patch.
I thought you was expecting a new netns ipv6 sysctl series and ignored the current one. While I was looking at them again I found a problem and I wanted to fix that before resending. In the meantime, there were three independant trivial patches I wanted to send as a pre-requesite for the incoming sysctl patches. Bad idea ... :)
- make ipv6_sysctl_register to return a value
- make a subsystem for af_inet6
- add ipv6 structure for netns
With the sysctl Pavel's patch, the first one does not apply.
To clear out any confusion, please can you just ignore all my previous patches, I will resend a new serie rebased on the work done by Pavel.
Sorry for the inconvenience.
Thanks.
-- Daniel
David Miller
maintainerFrom: Daniel Lezcano <[email protected]>
Date: Wed, 09 Jan 2008 10:56:48 +0100
Quoted 2 lines
To clear out any confusion, please can you just ignore all my previous patches, I will resend a new serie rebased on the work done by Pavel.
Ok, thanks.