---

yaml --- r: 330231 b: refs/heads/master c: 6825a26 h: refs/heads/master i: 330229: 6a9bcb2 330227: 9998cad 330223: 8c68fe8 v: v3
git-mirror · Oct 4, 2012 · 3f45440 · 3f45440
1 parent f1b6cd0
commit 3f45440
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32418cfe495c95013be2e805c087db89dcefac6d
+refs/heads/master: 6825a26c2dc21eb4f8df9c06d3786ddec97cf53b
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
@@ -1593,17 +1593,18 @@ static int __ip6_del_rt(struct rt6_info *rt, struct nl_info *info)
 	struct fib6_table *table;
 	struct net *net = dev_net(rt->dst.dev);
 
-	if (rt == net->ipv6.ip6_null_entry)
-		return -ENOENT;
+	if (rt == net->ipv6.ip6_null_entry) {
+		err = -ENOENT;
+		goto out;
+	}
 
 	table = rt->rt6i_table;
 	write_lock_bh(&table->tb6_lock);
-
 	err = fib6_del(rt, info);
-	dst_release(&rt->dst);
-
 	write_unlock_bh(&table->tb6_lock);
 
+out:
+	dst_release(&rt->dst);
 	return err;
 }