From patchwork Fri May 4 02:54:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 908449 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="cxWTU+Sq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40cc7S1hNxz9s35 for ; Fri, 4 May 2018 12:55:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751718AbeEDCyw (ORCPT ); Thu, 3 May 2018 22:54:52 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:38992 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751684AbeEDCys (ORCPT ); Thu, 3 May 2018 22:54:48 -0400 Received: by mail-pf0-f194.google.com with SMTP id a22so2190767pfn.6 for ; Thu, 03 May 2018 19:54:48 -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=nywF5+jIDjexXJIYqvbN2QxydbfCFvfGcXOgG+epwXE=; b=cxWTU+SqhdLX3CrpA4SV1zeAnOuh4ISCc0Vm6rj9MrWvkBVpTEBZ6kNfqbrc5HFm7S xGtXoxuM1qLWSESBNioVq36uhQH0LqXgavypWX6H8KBwaEFZGI25SNwKbjNwwmIYB3OM 2NzBXPI0iPEWgpEm+Ofed20vhyQertWzAZGUIeenqqBzbAZzmCpUeALLfTCAWk/1rsp2 I7S4NJ1uPkpvdVIzyy/yemQ1eyfdGK0mLn23sj8QWiT3eLm4ON0BRfLE+ZpdyRwaduY9 L76XpmjGRcWHzR9y72gfZF3hoekZbTg8pCXZMrcXoFO9WeYrt21pqTdpRJweq/vmtxq/ jShQ== 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=nywF5+jIDjexXJIYqvbN2QxydbfCFvfGcXOgG+epwXE=; b=UbO5MSk1hFQ2bDy6bZqYT9Cv9Mn3bslHvJagQs73NviRCxAdQfusOGHLC3Spd5mdrw ijUlQ5ILBde3vAVFtjE30FT/wZh0MBFkr9rbUiqpnVLblpLqmR0+YbqcXhKTdJWQQTAF 36o1ezwzf7MIjY3zxnzJmVWIsHtj8j3aIicq+7WZM3GYdnfTe0G3a44lvTkCsM1F+QC/ Bntjc9WYYKH4qKYh8X9DvPbdZAYxjFqpDoF5wBNFgKJHaUfQX1A5y8oHnLbOcBA32vmN kXbtjEjwYtuRUfZGN3opDIe5vBY0q5f3RDd9Ojp1pstSd3Y0onLDG6vGoiexLHPEdcw0 +Ngg== X-Gm-Message-State: ALQs6tCvpqzxuZ1UWX7UZddHyMOLN4EzA4fNgznf/0+guUvQTaWw/N7p VY/4OuSjzzw7bE3eJasaYvasrQ== X-Google-Smtp-Source: AB8JxZr/JGORYGihYTJQx9fVToKMMpZcFyRFUIaD1eN6fY8ix4heyJlOD7uN0AkSVrMI7isrZS5vGQ== X-Received: by 2002:a17:902:3343:: with SMTP id a61-v6mr15926552plc.241.1525402487734; Thu, 03 May 2018 19:54:47 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com. [216.129.126.126]) by smtp.googlemail.com with ESMTPSA id a5sm30930143pff.8.2018.05.03.19.54.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 May 2018 19:54:46 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org, borkmann@iogearbox.net, ast@kernel.org Cc: davem@davemloft.net, shm@cumulusnetworks.com, roopa@cumulusnetworks.com, brouer@redhat.com, toke@toke.dk, john.fastabend@gmail.com, David Ahern Subject: [bpf-next v2 1/9] net/ipv6: Rename fib6_lookup to fib6_node_lookup Date: Thu, 3 May 2018 19:54:24 -0700 Message-Id: <20180504025432.23451-2-dsahern@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180504025432.23451-1-dsahern@gmail.com> References: <20180504025432.23451-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 | 14 ++++++++------ net/ipv6/route.c | 8 ++++---- 3 files changed, 15 insertions(+), 13 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..4cfffa0f676e 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -1354,8 +1354,8 @@ struct lookup_args { const struct in6_addr *addr; /* search key */ }; -static struct fib6_node *fib6_lookup_1(struct fib6_node *root, - struct lookup_args *args) +static struct fib6_node *fib6_node_lookup_1(struct fib6_node *root, + struct lookup_args *args) { struct fib6_node *fn; __be32 dir; @@ -1400,7 +1400,8 @@ static struct fib6_node *fib6_lookup_1(struct fib6_node *root, #ifdef CONFIG_IPV6_SUBTREES if (subtree) { struct fib6_node *sfn; - sfn = fib6_lookup_1(subtree, args + 1); + sfn = fib6_node_lookup_1(subtree, + args + 1); if (!sfn) goto backtrack; fn = sfn; @@ -1422,8 +1423,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[] = { @@ -1442,7 +1444,7 @@ struct fib6_node *fib6_lookup(struct fib6_node *root, const struct in6_addr *dad } }; - fn = fib6_lookup_1(root, daddr ? args : args + 1); + fn = fib6_node_lookup_1(root, daddr ? args : args + 1); if (!fn || fn->fn_flags & RTN_TL_ROOT) fn = root; diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 7ee0a34fba46..d903db30dfff 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) { @@ -1815,7 +1815,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) @@ -2420,7 +2420,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)