Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fa89642 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[IPV4]: Cleanup the devinet_sysctl_register 



I moved the call to kmalloc() from the *t declaration into
the code (this is confusing when a variable is initialized
with the result of some call) and removed unneeded comment
near the error path. Just like I did with the neigh ctl-s.

Besides, I fixed the goto's and the labels - they were indented
with spaces :(

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3bac5a7

net/ipv4/devinet.c

+9 −8
Original line number Diff line number Diff line
@@ -1506,12 +1506,13 @@ static void devinet_sysctl_register(struct in_device *in_dev, 
{

	int i;

	struct net_device *dev = in_dev ? in_dev->dev : NULL;

	struct devinet_sysctl_table *t = kmemdup(&devinet_sysctl, sizeof(*t),

						 GFP_KERNEL);

	struct devinet_sysctl_table *t;

	char *dev_name = NULL;



	t = kmemdup(&devinet_sysctl, sizeof(*t), GFP_KERNEL);

	if (!t)

		return;

		goto out;



	for (i = 0; i < ARRAY_SIZE(t->devinet_vars) - 1; i++) {

		t->devinet_vars[i].data += (char *)p - (char *)&ipv4_devconf;

		t->devinet_vars[i].extra1 = p;
@@ -1547,11 +1548,11 @@ static void devinet_sysctl_register(struct in_device *in_dev, 
	p->sysctl = t;

	return;



	/* error path */

free_procname:

	kfree(dev_name);

free:

	kfree(t);

out:

	return;

}