summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-10-17 21:25:32 -0700
committerDavid S. Miller <davem@davemloft.net>2007-10-17 21:25:32 -0700
commitaaf70ec7fde2321281b2a49c7c9f881c90d0d208 (patch)
tree8d60e06a4b8eb498f35c0c3a3446fc00cdf8f61b /net
parent16910b9829797cda4032fbc84e5292ac7b4474f7 (diff)
downloadlinux-stable-aaf70ec7fde2321281b2a49c7c9f881c90d0d208.tar.gz
linux-stable-aaf70ec7fde2321281b2a49c7c9f881c90d0d208.tar.bz2
linux-stable-aaf70ec7fde2321281b2a49c7c9f881c90d0d208.zip
[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: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/addrconf.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index edf06ca34749..348bd8d06112 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -255,11 +255,6 @@ static void addrconf_mod_timer(struct inet6_ifaddr *ifp,
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,
sizeof(struct ipstats_mib),
__alignof__(struct ipstats_mib)) < 0)
@@ -280,7 +275,7 @@ err_icmpmsg:
err_icmp:
snmp_mib_free((void **)idev->stats.ipv6);
err_ip:
- return err;
+ return -ENOMEM;
}
static void snmp6_free_dev(struct inet6_dev *idev)