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 2A3F8C2BCA1 for ; Fri, 7 Jun 2019 15:09:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB51B216FD for ; Fri, 7 Jun 2019 15:09:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559920188; bh=fkSvC7TbTJxbnHWZvTq/2sBVtBMskrzuxgr2mcnJ0Jo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=J4cVJHcU3RaJNpoi63IZ9A/Ruq8eRGM7UgRa+6uhAQbqmlsh5xNe6Ou/wBnBRWQtW m0X8Q9bHYIm2SyQE7MxR9wc4hrw0ysieX3gdQNfRir80MxMLEIa9A3sfo51c5ja4sa DSHIfk6NGO+z/0Cy/kB3G1hj4uuBAjg34FA7Nu7o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729725AbfFGPJr (ORCPT ); Fri, 7 Jun 2019 11:09:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:51320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729610AbfFGPJo (ORCPT ); Fri, 7 Jun 2019 11:09:44 -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 D98072147A; Fri, 7 Jun 2019 15:09:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559920184; bh=fkSvC7TbTJxbnHWZvTq/2sBVtBMskrzuxgr2mcnJ0Jo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HK+tbZ/ZJzapXxK2Msn4KYC0Bd4fNKG5+DOsU4bIVUUSv+FQVZW4hCpry12fmbHjg +5U64qF80NDVP0D9ZB1p9dDZRx/B0AqFPdAywE3NlZAGEj++9z/vLuUgqOvGHxfOzh g9CC8TzWLFaWiNdYYvVYr7dmvfqSUg3r8jfID0yw= 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 v2 net-next 06/20] ipv6: Handle all fib6_nh in a nexthop in fib6_info_uses_dev Date: Fri, 7 Jun 2019 08:09:27 -0700 Message-Id: <20190607150941.11371-7-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190607150941.11371-1-dsahern@kernel.org> References: <20190607150941.11371-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 8a21f63917bf..bdbd3f1f417a 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