OpenVZ Forum


Home » Mailing lists » Devel » [PATCH] Cleanup snmp6_alloc_dev()
[PATCH] Cleanup snmp6_alloc_dev() [message #21870] Wed, 17 October 2007 10:44 Go to next message
Pavel Emelianov is currently offline  Pavel Emelianov
Messages: 1149
Registered: September 2006
Senior Member
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>

---

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 52d10d2..c173549 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 int snmp6_free_dev(struct inet6_dev *idev)
Re: [PATCH] Cleanup snmp6_alloc_dev() [message #21940 is a reply to message #21870] Thu, 18 October 2007 04:25 Go to previous message
davem is currently offline  davem
Messages: 463
Registered: February 2006
Senior Member
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 17 Oct 2007 14:44:44 +0400

> 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>

Applied.
Previous Topic: [PATCH] Fix return type for snmp6_free_dev()
Next Topic: [PATCH] Consolidate creation of kmem caches with "calculated" names
Goto Forum:
  


Current Time: Sun May 28 03:05:28 GMT 2023

Total time taken to generate the page: 0.01336 seconds