---

yaml --- r: 236800 b: refs/heads/master c: b8dad61 h: refs/heads/master v: v3
git-mirror · Jan 28, 2011 · 6998fc8 · 6998fc8
1 parent 21adee5
commit 6998fc8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 725d1e1b457dc2bbebb337677e73efe7c6d14da5
+refs/heads/master: b8dad61cc74b9ec71052e2a0e1c5119c65d166da
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
@@ -1861,8 +1861,10 @@ static void rt_init_metrics(struct rtable *rt, struct fib_info *fi)
 {
 	if (!(rt->fl.flags & FLOWI_FLAG_PRECOW_METRICS)) {
 	no_cow:
-		rt->fi = fi;
-		atomic_inc(&fi->fib_clntref);
+		if (fi->fib_metrics != (u32 *) dst_default_metrics) {
+			rt->fi = fi;
+			atomic_inc(&fi->fib_clntref);
+		}
 		dst_init_metrics(&rt->dst, fi->fib_metrics, true);
 	} else {
 		struct inet_peer *peer;