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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,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 0A969C28CC6 for ; Wed, 5 Jun 2019 23:15:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9E582147A for ; Wed, 5 Jun 2019 23:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559776532; bh=jcNU7NyfUkMhFOxF5gJmExhA06vhcK4YLfhdMUcuukw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=T3sSFoBGZloMqK7GHzY6MVXTASfJpBYJGtoNjMOBXVqUNdpoEMnYZA5zn8+T35SQP hiQ0gQTE8nkibcML7zH3hHtYps7Z8atP9TxcHw2n812PJDQ+O8ayJgHqInzMAQAEH7 diFw7Cr/UTm/uBt8M3Uwx9b7Jw1NI+EJ7SOMpRCw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726668AbfFEXP1 (ORCPT ); Wed, 5 Jun 2019 19:15:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:59368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726541AbfFEXP1 (ORCPT ); Wed, 5 Jun 2019 19:15:27 -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 6C466208C0; Wed, 5 Jun 2019 23:15:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559776526; bh=jcNU7NyfUkMhFOxF5gJmExhA06vhcK4YLfhdMUcuukw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MI9Pb2Onhswr497jfK10/6j7fQBlYtVPhSqCRG5XFW3Ato5kC32G42tWEiW4EYrt3 een9pUpmpMgsYGhxGP81bShNKov5ESYRTt+CgbNRUmMsJjXS0bXJpfek5mRjBVzIrm 21BSljRFFHkVsQ2Teim+Muqs+4AHVyTRDIhA4m3A= From: David Ahern To: davem@davemloft.net, netdev@vger.kernel.org Cc: idosch@mellanox.com, kafai@fb.com, weiwan@google.com, sbrivio@redhat.com, David Ahern Subject: [PATCH net-next 06/19] ipv6: Handle all fib6_nh in a nexthop in fib6_info_uses_dev Date: Wed, 5 Jun 2019 16:15:10 -0700 Message-Id: <20190605231523.18424-7-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190605231523.18424-1-dsahern@kernel.org> References: <20190605231523.18424-1-dsahern@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern Add a hook in fib6_info_uses_dev to handle nexthop struct in a fib6_info. Signed-off-by: David Ahern --- net/ipv6/route.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index aaa10e716115..6f4bd971df70 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -5194,9 +5194,27 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb, return -EMSGSIZE; } +static int fib6_info_nh_uses_dev(struct fib6_nh *nh, void *arg) +{ + const struct net_device *dev = arg; + + if (nh->fib_nh_dev == dev) + return 1; + + return 0; +} + static bool fib6_info_uses_dev(const struct fib6_info *f6i, const struct net_device *dev) { + if (f6i->nh) { + struct net_device *_dev = (struct net_device *)dev; + + return !!nexthop_for_each_fib6_nh(f6i->nh, + fib6_info_nh_uses_dev, + _dev); + } + if (f6i->fib6_nh->fib_nh_dev == dev) return true; -- 2.11.0