From patchwork Tue Jul 10 15:07:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 170210 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 731DF2C01FA for ; Wed, 11 Jul 2012 01:08:13 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754958Ab2GJPHy (ORCPT ); Tue, 10 Jul 2012 11:07:54 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:38428 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754874Ab2GJPHx (ORCPT ); Tue, 10 Jul 2012 11:07:53 -0400 Received: from localhost (74-93-104-98-Washington.hfc.comcastbusiness.net [74.93.104.98]) by shards.monkeyblade.net (Postfix) with ESMTPSA id C8F27586620 for ; Tue, 10 Jul 2012 08:07:54 -0700 (PDT) Date: Tue, 10 Jul 2012 08:07:52 -0700 (PDT) Message-Id: <20120710.080752.1968515537537191422.davem@davemloft.net> To: netdev@vger.kernel.org Subject: [PATCH 14/16] ipv4: Kill dst_copy_metrics() call from ipv4_blackhole_route(). From: David Miller X-Mailer: Mew version 6.5 on Emacs 24.0.97 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- net/ipv4/route.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 1678b57..a967df5 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)