From patchwork Wed Apr 25 18:34:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 904670 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="G+59D1gY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40WTQS5lphz9ry1 for ; Thu, 26 Apr 2018 04:35:12 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756164AbeDYSfK (ORCPT ); Wed, 25 Apr 2018 14:35:10 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33186 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756114AbeDYSfE (ORCPT ); Wed, 25 Apr 2018 14:35:04 -0400 Received: by mail-pf0-f196.google.com with SMTP id f15so15967221pfn.0 for ; Wed, 25 Apr 2018 11:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0SaUn4nlXJOztQ/XJuj2IdvplvDt+U/vKyMX9CnL7oo=; b=G+59D1gY1QqR4hCBH9R40gv60uHGpojvffLVQnMw/oPVEtVMT4ZCDOUN+2M2gn1mMP PuXHB/+Ks9RvEwymCbvH2G1htSs17VZ3MJSA2aqZfi4nuD/dRAzKcvRAqspgqsx2G2MN Bb3M3BQB/MdN9t6p4WzJgeapZuM64vcMPk/qvhKjICvlLboceCrRx51Vz9r6r2pnAUkE 9MYyuRavAJcdNjaCLXpXHvSRzyQBWaTdD4LQxfvUSD7Ptm67JjjRSL2J1TJFmGDLS9PR Ka4fa9PiYbffUX5VpN1H5qOvri2PJnILG9W1KqC8gZkXGdohcd/f5iEjH40gG33FGOaj tpkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0SaUn4nlXJOztQ/XJuj2IdvplvDt+U/vKyMX9CnL7oo=; b=eZbKC3pyIZRILYbGs4BhfYKpefCCRgnr+bLIGa4obnTutVSQqvpD+esI5sGmpQ5kLF V8Goj04yJ7TdGDHsw+bvmR1kxcpJ3nd+bwkmoKoRa9+087YujVDpdjJ3xaWHWMSje4pw AQRNyfZK8Z1mCqzER+uEfpuwL+GBzdItsfL0G8JjMaQKSgec/1JPFMVu5y3qo+dDC4gk xQ6LGBphzw+ZI/FbCzWpUAOJddUIGkpCrX5iIMZQ8wx3Ua/ufOF6pQStypv7ErnC//7M 60S4Nxh+EE4oJEi3b3/Luv+71/xCxYq0szXQV71/OqCSQ3T3QubQvTw1knLhfkPntyW8 vWWA== X-Gm-Message-State: ALQs6tDkn+ECLkhGd5wEx2AG3C0c3ogqDTuo+kN5e4imDeg50sDIDwh7 /LzLc63a6cb/Sn5G/znSuMbCdg== X-Google-Smtp-Source: AB8JxZosBsfJsusY0EIfcd9lYT+8q9AMaNLgOCjtUOOZM9DG1OXWv/vL7Khx5qWm9t63LM9KzlPwvQ== X-Received: by 10.98.194.199 with SMTP id w68mr3930859pfk.174.1524681303705; Wed, 25 Apr 2018 11:35:03 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com. [216.129.126.126]) by smtp.googlemail.com with ESMTPSA id e83sm47492377pfd.175.2018.04.25.11.35.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 11:35:02 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org, borkmann@iogearbox.net, ast@kernel.org Cc: shm@cumulusnetworks.com, roopa@cumulusnetworks.com, brouer@redhat.com, toke@toke.dk, john.fastabend@gmail.com, David Ahern Subject: [RFC bpf-next 1/9] net/ipv6: Rename fib6_lookup to fib6_node_lookup Date: Wed, 25 Apr 2018 11:34:41 -0700 Message-Id: <20180425183449.25134-2-dsahern@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180425183449.25134-1-dsahern@gmail.com> References: <20180425183449.25134-1-dsahern@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Rename fib6_lookup to fib6_node_lookup to better reflect what it returns. The fib6_lookup name will be used in a later patch for an IPv6 equivalent to IPv4's fib_lookup. Signed-off-by: David Ahern --- include/net/ip6_fib.h | 6 +++--- net/ipv6/ip6_fib.c | 5 +++-- net/ipv6/route.c | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 1af450d4e923..5a16630179cb 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -376,9 +376,9 @@ struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi6 *fl6, const struct sk_buff *skb, int flags, pol_lookup_t lookup); -struct fib6_node *fib6_lookup(struct fib6_node *root, - const struct in6_addr *daddr, - const struct in6_addr *saddr); +struct fib6_node *fib6_node_lookup(struct fib6_node *root, + const struct in6_addr *daddr, + const struct in6_addr *saddr); struct fib6_node *fib6_locate(struct fib6_node *root, const struct in6_addr *daddr, int dst_len, diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 6421c893466e..f6442d6c5603 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -1422,8 +1422,9 @@ static struct fib6_node *fib6_lookup_1(struct fib6_node *root, /* called with rcu_read_lock() held */ -struct fib6_node *fib6_lookup(struct fib6_node *root, const struct in6_addr *daddr, - const struct in6_addr *saddr) +struct fib6_node *fib6_node_lookup(struct fib6_node *root, + const struct in6_addr *daddr, + const struct in6_addr *saddr) { struct fib6_node *fn; struct lookup_args args[] = { diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 0407bbc5a028..e4082c612fcc 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1006,7 +1006,7 @@ static struct fib6_node* fib6_backtrack(struct fib6_node *fn, pn = rcu_dereference(fn->parent); sn = FIB6_SUBTREE(pn); if (sn && sn != fn) - fn = fib6_lookup(sn, NULL, saddr); + fn = fib6_node_lookup(sn, NULL, saddr); else fn = pn; if (fn->fn_flags & RTN_RTINFO) @@ -1059,7 +1059,7 @@ static struct rt6_info *ip6_pol_route_lookup(struct net *net, flags &= ~RT6_LOOKUP_F_IFACE; rcu_read_lock(); - fn = fib6_lookup(&table->tb6_root, &fl6->daddr, &fl6->saddr); + fn = fib6_node_lookup(&table->tb6_root, &fl6->daddr, &fl6->saddr); restart: f6i = rcu_dereference(fn->leaf); if (!f6i) { @@ -1814,7 +1814,7 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, rcu_read_lock(); - fn = fib6_lookup(&table->tb6_root, &fl6->daddr, &fl6->saddr); + fn = fib6_node_lookup(&table->tb6_root, &fl6->daddr, &fl6->saddr); saved_fn = fn; if (fl6->flowi6_flags & FLOWI_FLAG_SKIP_NH_OIF) @@ -2417,7 +2417,7 @@ static struct rt6_info *__ip6_route_redirect(struct net *net, */ rcu_read_lock(); - fn = fib6_lookup(&table->tb6_root, &fl6->daddr, &fl6->saddr); + fn = fib6_node_lookup(&table->tb6_root, &fl6->daddr, &fl6->saddr); restart: for_each_fib6_node_rt_rcu(fn) { if (rt->fib6_nh.nh_flags & RTNH_F_DEAD)