diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-12-01 08:21:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:55:26 -0500 |
commit | f68635e627f9b21db05102e2d8fcd2894493d6bc (patch) | |
tree | f789b8c971c7db3f1b7ffb8014ad963e35accba2 /net | |
parent | 9fa896429905eccc263ff0d5e592ecaf651af12d (diff) |
[IPV6]: Cleanup the addconf_sysctl_register
This only includes fixing the space-indented lines and
removing one unneeded else after the goto.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/addrconf.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index f177424c186f..2d2886a0b66d 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -4127,7 +4127,8 @@ static void addrconf_sysctl_register(struct inet6_dev *idev, struct ipv6_devconf | |||
4127 | 4127 | ||
4128 | t = kmemdup(&addrconf_sysctl, sizeof(*t), GFP_KERNEL); | 4128 | t = kmemdup(&addrconf_sysctl, sizeof(*t), GFP_KERNEL); |
4129 | if (t == NULL) | 4129 | if (t == NULL) |
4130 | return; | 4130 | goto out; |
4131 | |||
4131 | for (i=0; t->addrconf_vars[i].data; i++) { | 4132 | for (i=0; t->addrconf_vars[i].data; i++) { |
4132 | t->addrconf_vars[i].data += (char*)p - (char*)&ipv6_devconf; | 4133 | t->addrconf_vars[i].data += (char*)p - (char*)&ipv6_devconf; |
4133 | t->addrconf_vars[i].extra1 = idev; /* embedded; no ref */ | 4134 | t->addrconf_vars[i].extra1 = idev; /* embedded; no ref */ |
@@ -4147,7 +4148,7 @@ static void addrconf_sysctl_register(struct inet6_dev *idev, struct ipv6_devconf | |||
4147 | */ | 4148 | */ |
4148 | dev_name = kstrdup(dev_name, GFP_KERNEL); | 4149 | dev_name = kstrdup(dev_name, GFP_KERNEL); |
4149 | if (!dev_name) | 4150 | if (!dev_name) |
4150 | goto free; | 4151 | goto free; |
4151 | 4152 | ||
4152 | t->addrconf_dev[0].procname = dev_name; | 4153 | t->addrconf_dev[0].procname = dev_name; |
4153 | 4154 | ||
@@ -4159,16 +4160,15 @@ static void addrconf_sysctl_register(struct inet6_dev *idev, struct ipv6_devconf | |||
4159 | t->sysctl_header = register_sysctl_table(t->addrconf_root_dir); | 4160 | t->sysctl_header = register_sysctl_table(t->addrconf_root_dir); |
4160 | if (t->sysctl_header == NULL) | 4161 | if (t->sysctl_header == NULL) |
4161 | goto free_procname; | 4162 | goto free_procname; |
4162 | else | 4163 | |
4163 | p->sysctl = t; | 4164 | p->sysctl = t; |
4164 | return; | 4165 | return; |
4165 | 4166 | ||
4166 | /* error path */ | 4167 | free_procname: |
4167 | free_procname: | ||
4168 | kfree(dev_name); | 4168 | kfree(dev_name); |
4169 | free: | 4169 | free: |
4170 | kfree(t); | 4170 | kfree(t); |
4171 | 4171 | out: | |
4172 | return; | 4172 | return; |
4173 | } | 4173 | } |
4174 | 4174 | ||