From patchwork Thu Jan 17 06:58:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Klassert X-Patchwork-Id: 213148 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 B2C732C0086 for ; Thu, 17 Jan 2013 17:58:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758979Ab3AQG6N (ORCPT ); Thu, 17 Jan 2013 01:58:13 -0500 Received: from a.mx.secunet.com ([195.81.216.161]:53809 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751908Ab3AQG6M (ORCPT ); Thu, 17 Jan 2013 01:58:12 -0500 Received: from localhost (alg1 [127.0.0.1]) by a.mx.secunet.com (Postfix) with ESMTP id EEF141A006C; Thu, 17 Jan 2013 07:58:11 +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 DE2991A0076; Thu, 17 Jan 2013 07:58:10 +0100 (CET) Received: from gauss.dd.secunet.de ([10.182.7.102]) by mail-srv1.secumail.de with Microsoft SMTPSVC(6.0.3790.4675); Thu, 17 Jan 2013 07:58:10 +0100 Received: by gauss.dd.secunet.de (Postfix, from userid 1000) id 828D65C1376; Thu, 17 Jan 2013 07:58:10 +0100 (CET) Date: Thu, 17 Jan 2013 07:58:10 +0100 From: Steffen Klassert To: David Miller Cc: Julian Anastasov , timo.teras@iki.fi, luky-37@hotmail.com, pupilla@libero.it, netdev@vger.kernel.org Subject: [PATCH 2/2] ipv4: Don't update the pmtu on mtu locked routes Message-ID: <20130117065810.GH18940@secunet.com> References: <20130117065500.GG18940@secunet.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130117065500.GG18940@secunet.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginalArrivalTime: 17 Jan 2013 06:58:10.0605 (UTC) FILETIME=[02F27DD0:01CDF480] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Routes with locked mtu should not use learned pmtu informations, so do not update the pmtu on these routes. Reported-by: Julian Anastasov Signed-off-by: Steffen Klassert --- net/ipv4/route.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 6e4a89c..259cbee 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -912,6 +912,9 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu) struct dst_entry *dst = &rt->dst; struct fib_result res; + if (dst_metric_locked(dst, RTAX_MTU)) + return; + if (dst->dev->mtu < mtu) return;