diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-18 00:25:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-10-18 00:25:32 -0400 |
commit | aaf70ec7fde2321281b2a49c7c9f881c90d0d208 (patch) | |
tree | 8d60e06a4b8eb498f35c0c3a3446fc00cdf8f61b /net/ipv6/addrconf.c | |
parent | 16910b9829797cda4032fbc84e5292ac7b4474f7 (diff) |
[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/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 7 |
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, | |||
255 | 255 | ||
256 | static int snmp6_alloc_dev(struct inet6_dev *idev) | 256 | static int snmp6_alloc_dev(struct inet6_dev *idev) |
257 | { | 257 | { |
258 | int err = -ENOMEM; | ||
259 | |||
260 | if (!idev || !idev->dev) | ||
261 | return -EINVAL; | ||
262 | |||
263 | if (snmp_mib_init((void **)idev->stats.ipv6, | 258 | if (snmp_mib_init((void **)idev->stats.ipv6, |
264 | sizeof(struct ipstats_mib), | 259 | sizeof(struct ipstats_mib), |
265 | __alignof__(struct ipstats_mib)) < 0) | 260 | __alignof__(struct ipstats_mib)) < 0) |
@@ -280,7 +275,7 @@ err_icmpmsg: | |||
280 | err_icmp: | 275 | err_icmp: |
281 | snmp_mib_free((void **)idev->stats.ipv6); | 276 | snmp_mib_free((void **)idev->stats.ipv6); |
282 | err_ip: | 277 | err_ip: |
283 | return err; | 278 | return -ENOMEM; |
284 | } | 279 | } |
285 | 280 | ||
286 | static void snmp6_free_dev(struct inet6_dev *idev) | 281 | static void snmp6_free_dev(struct inet6_dev *idev) |