diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-10 20:41:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:01:38 -0500 |
commit | 9589731220edfebeb6a05c52d0838a99dee20893 (patch) | |
tree | 3b98d5d1b1544a04e08575268428f5cfe38dd88b /net | |
parent | 408c4768cd0843f43a13a442c76215dd9cadf23d (diff) |
[NETNS]: Make the __addrconf_sysctl_register return an error
This error code will be needed to abort the namespace
creation if needed.
Probably, this is to be checked when a new device is
created (currently it is ignored).
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/addrconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 27b35ddeeabf..18d43349013e 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -4044,7 +4044,7 @@ static struct addrconf_sysctl_table | |||
4044 | }, | 4044 | }, |
4045 | }; | 4045 | }; |
4046 | 4046 | ||
4047 | static void __addrconf_sysctl_register(char *dev_name, int ctl_name, | 4047 | static int __addrconf_sysctl_register(char *dev_name, int ctl_name, |
4048 | struct inet6_dev *idev, struct ipv6_devconf *p) | 4048 | struct inet6_dev *idev, struct ipv6_devconf *p) |
4049 | { | 4049 | { |
4050 | int i; | 4050 | int i; |
@@ -4088,14 +4088,14 @@ static void __addrconf_sysctl_register(char *dev_name, int ctl_name, | |||
4088 | goto free_procname; | 4088 | goto free_procname; |
4089 | 4089 | ||
4090 | p->sysctl = t; | 4090 | p->sysctl = t; |
4091 | return; | 4091 | return 0; |
4092 | 4092 | ||
4093 | free_procname: | 4093 | free_procname: |
4094 | kfree(t->dev_name); | 4094 | kfree(t->dev_name); |
4095 | free: | 4095 | free: |
4096 | kfree(t); | 4096 | kfree(t); |
4097 | out: | 4097 | out: |
4098 | return; | 4098 | return -ENOBUFS; |
4099 | } | 4099 | } |
4100 | 4100 | ||
4101 | static void __addrconf_sysctl_unregister(struct ipv6_devconf *p) | 4101 | static void __addrconf_sysctl_unregister(struct ipv6_devconf *p) |