From: Ingo Oeser [EMAIL PROTECTED]
Here are some possible (and trivial) cleanups.
- use kzalloc() where possible
- invert allocation failure test like
if (object) {
/* Rest of function here */
}
to
if (object == NULL)
return NULL;
/* Rest of function here */
Signed-off-by: Ingo Oeser [EMAIL PROTECTED]
Acked-by: YOSHIFUJI Hideaki [EMAIL PROTECTED]
---
Hello Dave,
On Friday, 10. March 2006 12:02, David S. Miller wrote:
This patch no longer applied cleanly, Ingo can you generate
a fresh version of your patch against my net-2.6.16 tree?
Done!
I rebased it, but against net-2.6.17, since it did apply cleanly to
net-2.6 and I didn't find the tree for net-2.6.16 as requested.
Hope I got it right :-)
Regards
Ingo Oeser
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 8df9eb9..395b3f8 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -341,84 +341,83 @@ static struct inet6_dev * ipv6_add_dev(s
if (dev-mtu IPV6_MIN_MTU)
return NULL;
- ndev = kmalloc(sizeof(struct inet6_dev), GFP_KERNEL);
-
- if (ndev) {
- memset(ndev, 0, sizeof(struct inet6_dev));
-
- rwlock_init(ndev-lock);
- ndev-dev = dev;
- memcpy(ndev-cnf, ipv6_devconf_dflt, sizeof(ndev-cnf));
- ndev-cnf.mtu6 = dev-mtu;
- ndev-cnf.sysctl = NULL;
- ndev-nd_parms = neigh_parms_alloc(dev, nd_tbl);
- if (ndev-nd_parms == NULL) {
- kfree(ndev);
- return NULL;
- }
- /* We refer to the device */
- dev_hold(dev);
+ ndev = kzalloc(sizeof(struct inet6_dev), GFP_KERNEL);
+
+ if (ndev == NULL)
+ return NULL;
+
+ rwlock_init(ndev-lock);
+ ndev-dev = dev;
+ memcpy(ndev-cnf, ipv6_devconf_dflt, sizeof(ndev-cnf));
+ ndev-cnf.mtu6 = dev-mtu;
+ ndev-cnf.sysctl = NULL;
+ ndev-nd_parms = neigh_parms_alloc(dev, nd_tbl);
+ if (ndev-nd_parms == NULL) {
+ kfree(ndev);
+ return NULL;
+ }
+ /* We refer to the device */
+ dev_hold(dev);
- if (snmp6_alloc_dev(ndev) 0) {
- ADBG((KERN_WARNING
- %s(): cannot allocate memory for statistics;
dev=%s.\n,
- __FUNCTION__, dev-name));
- neigh_parms_release(nd_tbl, ndev-nd_parms);
- ndev-dead = 1;
- in6_dev_finish_destroy(ndev);
- return NULL;
- }
+ if (snmp6_alloc_dev(ndev) 0) {
+ ADBG((KERN_WARNING
+ %s(): cannot allocate memory for statistics;
dev=%s.\n,
+ __FUNCTION__, dev-name));
+ neigh_parms_release(nd_tbl, ndev-nd_parms);
+ ndev-dead = 1;
+ in6_dev_finish_destroy(ndev);
+ return NULL;
+ }
- if (snmp6_register_dev(ndev) 0) {
- ADBG((KERN_WARNING
- %s(): cannot create /proc/net/dev_snmp6/%s\n,
- __FUNCTION__, dev-name));
- neigh_parms_release(nd_tbl, ndev-nd_parms);
- ndev-dead = 1;
- in6_dev_finish_destroy(ndev);
- return NULL;
- }
+ if (snmp6_register_dev(ndev) 0) {
+ ADBG((KERN_WARNING
+ %s(): cannot create /proc/net/dev_snmp6/%s\n,
+ __FUNCTION__, dev-name));
+ neigh_parms_release(nd_tbl, ndev-nd_parms);
+ ndev-dead = 1;
+ in6_dev_finish_destroy(ndev);
+ return NULL;
+ }
- /* One reference from device. We must do this before
-* we invoke __ipv6_regen_rndid().
-*/
- in6_dev_hold(ndev);
+ /* One reference from device. We must do this before
+* we invoke __ipv6_regen_rndid().
+*/
+ in6_dev_hold(ndev);
#ifdef CONFIG_IPV6_PRIVACY
- init_timer(ndev-regen_timer);
- ndev-regen_timer.function = ipv6_regen_rndid;
- ndev-regen_timer.data = (unsigned long) ndev;
- if ((dev-flagsIFF_LOOPBACK) ||
- dev-type == ARPHRD_TUNNEL ||
- dev-type == ARPHRD_NONE ||
- dev-type == ARPHRD_SIT) {
- printk(KERN_INFO
- %s: Disabled Privacy Extensions\n,
- dev-name);
- ndev-cnf.use_tempaddr = -1;
- } else {
- in6_dev_hold(ndev);
- ipv6_regen_rndid((unsigned long) ndev);
- }
+ init_timer(ndev-regen_timer);
+ ndev-regen_timer.function
