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 6624BC282CE for ; Tue, 9 Apr 2019 21:41:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29CDF2082A for ; Tue, 9 Apr 2019 21:41:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554846062; bh=QvpMSYMOBVwVkMwb7zH7UvaboQPn+JWCpfMnBONnXac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mn0C3sKqkiglKrUjOdO+INfnBiBCBuVABFvH8TsF45fBFil0l3RrdY5h8TaX5lg88 9nfKed4NHlI2wwZ/SagFribMgryYslHoR3Gm5QKlh+rd7FAgy7FwOGifO6nJJwt1MY cSueJv2JzBRRi3qZNLrG895I8zIPejMgoY6GQ+7w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726791AbfDIVlB (ORCPT ); Tue, 9 Apr 2019 17:41:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:56020 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726744AbfDIVk7 (ORCPT ); Tue, 9 Apr 2019 17:40:59 -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 2AA522147C; Tue, 9 Apr 2019 21:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554846059; bh=QvpMSYMOBVwVkMwb7zH7UvaboQPn+JWCpfMnBONnXac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fIOn8NDhkSMN34Ao+/wDOx5+FgcAiRyTVvl89iwb4KKDyvTVhthICCYbbcZBC/rB3 6Os9gq7lypKtullYNRY/j8C7Z3OKTdhYfY+EfArXmimJUiBQ1X7Xj2rflZ3TOIvJ3t 9ljaPGFUx8W+ppbnLu2s7JUQqU7EV+BNmrgz+v1g= From: David Ahern To: davem@davemloft.net, netdev@vger.kernel.org Cc: idosch@mellanox.com, David Ahern Subject: [PATCH net-next 02/10] ipv6: Remove rt6_check_dev Date: Tue, 9 Apr 2019 14:41:11 -0700 Message-Id: <20190409214119.15258-3-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 rt6_check_dev is a simpler helper with only 1 caller. Fold the code into rt6_score_route. Signed-off-by: David Ahern --- net/ipv6/route.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index b515fa8f787e..9630339d4b76 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -580,15 +580,6 @@ static inline void rt6_probe(struct fib6_info *rt) /* * Default Router Selection (RFC 2461 6.3.6) */ -static inline int rt6_check_dev(struct fib6_info *rt, int oif) -{ - const struct net_device *dev = rt->fib6_nh.fib_nh_dev; - - if (!oif || dev->ifindex == oif) - return 2; - return 0; -} - static enum rt6_nud_state rt6_check_neigh(const struct fib6_nh *fib6_nh) { enum rt6_nud_state ret = RT6_NUD_FAIL_HARD; @@ -620,9 +611,11 @@ static enum rt6_nud_state rt6_check_neigh(const struct fib6_nh *fib6_nh) static int rt6_score_route(struct fib6_info *rt, int oif, int strict) { struct fib6_nh *nh = &rt->fib6_nh; - int m; + int m = 0; + + if (!oif || nh->fib_nh_dev->ifindex == oif) + m = 2; - m = rt6_check_dev(rt, oif); if (!m && (strict & RT6_LOOKUP_F_IFACE)) return RT6_NUD_FAIL_HARD; #ifdef CONFIG_IPV6_ROUTER_PREF -- 2.11.0