[<prev] [next>] [day] [month] [year] [list]
Message-ID: <47505BB6.5090202@openvz.org>
Date: Fri, 30 Nov 2007 21:51:34 +0300
From: Pavel Emelyanov <xemul@...nvz.org>
To: Herbert Xu <herbert@...dor.apana.org.au>
CC: Linux Netdev List <netdev@...r.kernel.org>, devel@...nvz.org
Subject: [PATCH net-2.6.25 1/3][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@...nvz.org>
---
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index f177424..2d2886a 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
t = kmemdup(&addrconf_sysctl, sizeof(*t), GFP_KERNEL);
if (t == NULL)
- return;
+ goto out;
+
for (i=0; t->addrconf_vars[i].data; i++) {
t->addrconf_vars[i].data += (char*)p - (char*)&ipv6_devconf;
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
*/
dev_name = kstrdup(dev_name, GFP_KERNEL);
if (!dev_name)
- goto free;
+ goto free;
t->addrconf_dev[0].procname = dev_name;
@@ -4159,16 +4160,15 @@ static void addrconf_sysctl_register(struct inet6_dev *idev, struct ipv6_devconf
t->sysctl_header = register_sysctl_table(t->addrconf_root_dir);
if (t->sysctl_header == NULL)
goto free_procname;
- else
- p->sysctl = t;
+
+ p->sysctl = t;
return;
- /* error path */
- free_procname:
+free_procname:
kfree(dev_name);
- free:
+free:
kfree(t);
-
+out:
return;
}
--
1.5.3.4
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists