From patchwork Wed Jan 16 06:36:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Klassert X-Patchwork-Id: 212409 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 E76212C0097 for ; Wed, 16 Jan 2013 17:36:52 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754024Ab3APGgt (ORCPT ); Wed, 16 Jan 2013 01:36:49 -0500 Received: from a.mx.secunet.com ([195.81.216.161]:35208 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752441Ab3APGgs (ORCPT ); Wed, 16 Jan 2013 01:36:48 -0500 Received: from localhost (alg1 [127.0.0.1]) by a.mx.secunet.com (Postfix) with ESMTP id 806981A0076; Wed, 16 Jan 2013 07:36:47 +0100 (CET) X-Virus-Scanned: by secunet Received: from mail-srv1.secumail.de (unknown [10.53.40.200]) by a.mx.secunet.com (Postfix) with ESMTP id 6F0481A006C; Wed, 16 Jan 2013 07:36:46 +0100 (CET) Received: from gauss.dd.secunet.de ([10.182.7.102]) by mail-srv1.secumail.de with Microsoft SMTPSVC(6.0.3790.4675); Wed, 16 Jan 2013 07:36:45 +0100 Received: by gauss.dd.secunet.de (Postfix, from userid 1000) id 0542F5C09E4; Wed, 16 Jan 2013 07:36:45 +0100 (CET) Date: Wed, 16 Jan 2013 07:36:45 +0100 From: Steffen Klassert To: David Miller Cc: timo.teras@iki.fi, luky-37@hotmail.com, pupilla@libero.it, netdev@vger.kernel.org Subject: [PATCH] ipv4: Remove output route check in ipv4_mtu Message-ID: <20130116063645.GC18940@secunet.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginalArrivalTime: 16 Jan 2013 06:36:46.0031 (UTC) FILETIME=[DADE4DF0:01CDF3B3] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The output route check was introduced with git commit 261663b0 (ipv4: Don't use the cached pmtu informations for input routes) during times when we cached the pmtu informations on the inetpeer. Now the pmtu informations are back in the routes, so this check is obsolete. It also had some unwanted side effects, as reported by Timo Teras and Lukas Tribus. Signed-off-by: Steffen Klassert --- net/ipv4/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 844a9ef..6e4a89c 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1120,7 +1120,7 @@ static unsigned int ipv4_mtu(const struct dst_entry *dst) if (!mtu || time_after_eq(jiffies, rt->dst.expires)) mtu = dst_metric_raw(dst, RTAX_MTU); - if (mtu && rt_is_output_route(rt)) + if (mtu) return mtu; mtu = dst->dev->mtu;