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

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

[IPV6]: Cleanup snmp6_alloc_dev() 



This functions is never called with NULL or not setup argument,
so the checks inside are redundant.

Also, the return value is always -ENOMEM, so no need in 
additional variable for this.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 16910b98

net/ipv6/addrconf.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -255,11 +255,6 @@ static void addrconf_mod_timer(struct inet6_ifaddr *ifp, 




static int snmp6_alloc_dev(struct inet6_dev *idev)

static int snmp6_alloc_dev(struct inet6_dev *idev)

{

{

	int err = -ENOMEM;



	if (!idev || !idev->dev)

		return -EINVAL;



	if (snmp_mib_init((void **)idev->stats.ipv6,

	if (snmp_mib_init((void **)idev->stats.ipv6,

			  sizeof(struct ipstats_mib),

			  sizeof(struct ipstats_mib),

			  __alignof__(struct ipstats_mib)) < 0)

			  __alignof__(struct ipstats_mib)) < 0)
@@ -280,7 +275,7 @@ static int snmp6_alloc_dev(struct inet6_dev *idev) 
err_icmp:

err_icmp:

	snmp_mib_free((void **)idev->stats.ipv6);

	snmp_mib_free((void **)idev->stats.ipv6);

err_ip:

err_ip:

	return err;

	return -ENOMEM;

}

}





static void snmp6_free_dev(struct inet6_dev *idev)

static void snmp6_free_dev(struct inet6_dev *idev)