---

yaml --- r: 264055 b: refs/heads/master c: 8603e33 h: refs/heads/master i: 264053: 234bd86 264051: 4b8cdb9 264047: a5bc39e v: v3
git-mirror · Sep 20, 2011 · e7dba6f · e7dba6f
1 parent 3fe2456
commit e7dba6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;
 	}