From patchwork Fri Nov 1 02:47:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duan Jiong X-Patchwork-Id: 287693 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 8EE282C03E4 for ; Fri, 1 Nov 2013 13:49:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755811Ab3KACtM (ORCPT ); Thu, 31 Oct 2013 22:49:12 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:54594 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754502Ab3KACtL (ORCPT ); Thu, 31 Oct 2013 22:49:11 -0400 X-IronPort-AV: E=Sophos;i="4.93,613,1378828800"; d="scan'208";a="8916903" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 01 Nov 2013 10:45:48 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id rA12n8cI019704; Fri, 1 Nov 2013 10:49:08 +0800 Received: from [10.167.225.86] ([10.167.225.86]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013110110472404-2698117 ; Fri, 1 Nov 2013 10:47:24 +0800 Message-ID: <52731633.2030101@cn.fujitsu.com> Date: Fri, 01 Nov 2013 10:47:15 +0800 From: Duan Jiong User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: David Miller CC: hannes@stressinduktion.org, netdev@vger.kernel.org, duanj.fnst@cn.fujitsu.com Subject: [PATCH net-next] ipv6: host should probe those non-reachable router X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/11/01 10:47:24, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/11/01 10:47:24, Serialize complete at 2013/11/01 10:47:24 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rather than those routers that the return value of rt6_score_route() is RT6_NUD_SUCCEED. Signed-off-by: Duan Jiong --- net/ipv6/route.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 1ac0b6e..b7bf5c7 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -623,12 +623,11 @@ static struct rt6_info *find_match(struct rt6_info *rt, int oif, int strict, match_do_rr = true; m = 0; /* lowest valid score */ } else if (m < 0) { + if (strict & RT6_LOOKUP_F_REACHABLE) + rt6_probe(rt); goto out; } - if (strict & RT6_LOOKUP_F_REACHABLE) - rt6_probe(rt); - if (m > *mpri) { *do_rr = match_do_rr; *mpri = m;