From e7dba6f823e7ea1a67ca2c056f950c91bc2b99f8 Mon Sep 17 00:00:00 2001
From: Roy Li <rongqing.li@windriver.com>
Date: Tue, 20 Sep 2011 15:10:16 -0400
Subject: [PATCH] --- yaml --- r: 264055 b: refs/heads/master c:
 8603e33d01cb6bd32de46b2596fe47f0c4df6c12 h: refs/heads/master i:   264053:
 234bd86918198c20aecc7556f2ee51410dd72f1b   264051:
 4b8cdb9dbd31ff4baee9efe8c8e19996164a6c8d   264047:
 a5bc39ed8aa37309a85068aa9bd5e92423ffe6ec v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/addrconf.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 89bdfae07e81..a4bced7e19b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe7d189d4a2ccbb3590b1da97a3f6a83fc2efd80
+refs/heads/master: 8603e33d01cb6bd32de46b2596fe47f0c4df6c12
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index f012ebd87b43..12368c586068 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -374,8 +374,8 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
 			"%s(): cannot allocate memory for statistics; dev=%s.\n",
 			__func__, dev->name));
 		neigh_parms_release(&nd_tbl, ndev->nd_parms);
-		ndev->dead = 1;
-		in6_dev_finish_destroy(ndev);
+		dev_put(dev);
+		kfree(ndev);
 		return NULL;
 	}