From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79539C10F0E for ; Tue, 9 Apr 2019 21:41:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D5A62082A for ; Tue, 9 Apr 2019 21:41:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554846088; bh=OZAuRWfm+XLbnTDcm7ir4j6KWpgLqVAV36BKihyfvMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mHOArviHktIpCAI7MRvjqxobaO9tKXhSnAkvEU7alO63MoFU+p2vxLGZdJ+L87Q8q P5j3eZlrCHIc6UDpeeOkon0BgJggITxi/AwhUmbC7Ayy8Jli00mo3Ram1ncASb6uah ++TOPU5+MhRUsVzn7/OlPIuyFf3f8iVtQ0oGRey0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727030AbfDIVl0 (ORCPT ); Tue, 9 Apr 2019 17:41:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:56040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726787AbfDIVlB (ORCPT ); Tue, 9 Apr 2019 17:41:01 -0400 Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com [216.129.126.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8A14C218EA; Tue, 9 Apr 2019 21:41:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554846060; bh=OZAuRWfm+XLbnTDcm7ir4j6KWpgLqVAV36BKihyfvMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EXrlVjtDPeA0XwvpyjWxkavDKKiZT2FkUBWMgWhgsq3sDpZS9nv7SX1Rw0nynMv38 JNc8QUW9r8XTihfnIHxK5ZHZtxaMSM8ZEKPc6iUwRe20jrk/UEFsYxyROGL1RCESzL cHL5lQiDprCQ8dlxzC2yscjNJZUIjAaYccu7uEnY= From: David Ahern To: davem@davemloft.net, netdev@vger.kernel.org Cc: idosch@mellanox.com, David Ahern Subject: [PATCH net-next 08/10] ipv6: Move fib6_multipath_select down in ip6_pol_route Date: Tue, 9 Apr 2019 14:41:17 -0700 Message-Id: <20190409214119.15258-9-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190409214119.15258-1-dsahern@kernel.org> References: <20190409214119.15258-1-dsahern@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern Move the siblings and fib6_multipath_select after the null entry check since a null entry can not have siblings. Signed-off-by: David Ahern --- net/ipv6/route.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 0745ed872e5b..4acb71f0bc55 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1843,9 +1843,6 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, rcu_read_lock(); f6i = fib6_table_lookup(net, table, oif, fl6, strict); - if (f6i->fib6_nsiblings) - f6i = fib6_multipath_select(net, f6i, fl6, oif, skb, strict); - if (f6i == net->ipv6.fib6_null_entry) { rt = net->ipv6.ip6_null_entry; rcu_read_unlock(); @@ -1853,6 +1850,9 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, return rt; } + if (f6i->fib6_nsiblings) + f6i = fib6_multipath_select(net, f6i, fl6, oif, skb, strict); + /*Search through exception table */ rt = rt6_find_cached_rt(f6i, &fl6->daddr, &fl6->saddr); if (rt) { -- 2.11.0