From: David S. Miller <davem@davemloft.net>
Date: Tue, 10 Jul 2012 14:03:43 +0000 (-0700)
Subject: ipv4: Kill dst_copy_metrics() call from ipv4_blackhole_route().
X-Git-Tag: v3.6-rc1~125^2~251^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2db2d67e4cf6100249bad575d9c13c16fd7b06dc;p=linux.git

ipv4: Kill dst_copy_metrics() call from ipv4_blackhole_route().

Blackhole routes have a COW metrics operation that returns NULL
always, therefore this dst_copy_metrics() call did absolutely
nothing.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 1678b575165b..a967df54a423 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2668,7 +2668,6 @@ struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_or
 		new->__use = 1;
 		new->input = dst_discard;
 		new->output = dst_discard;
-		dst_copy_metrics(new, &ort->dst);
 
 		new->dev = ort->dst.dev;
 		if (new->dev)