[PATCH v2 net-next 1/9] ipv4: Rename ipv4_neigh_lookup() to ipv4_dst_neigh_lookup().
flat view
COLD16d
LANDED
From: Kuniyuki Iwashima <kuniyu@google.com>
Date: 2026-10-03 21:23:45
Subsystem:
networking [general], networking [ipv4/ipv6], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, David Ahern, Ido Schimmel, Linus Torvalds
Revision v2 of 2 in this series; landed in mainline as 07cc2b151a26 on 2026-10-07.
Revisions (2)
- v1 [diff vs current]
- v2 current
Later, we will add ipv4_neigh_lookup() as a wrapper for neigh_lookup(arp_table(net), ...). The existing ipv4_neigh_lookup() is more like ip6_dst_neigh_lookup(). Let's rename ipv4_neigh_lookup() to ipv4_dst_neigh_lookup(). Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com> --- net/ipv4/route.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index d7da2f1acbb5..50c842617e45 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c@@ -146,9 +146,9 @@ static u32 *ipv4_cow_metrics(struct dst_entry *dst, unsigned long old) return NULL; } -static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst, - struct sk_buff *skb, - const void *daddr); +static struct neighbour *ipv4_dst_neigh_lookup(const struct dst_entry *dst, + struct sk_buff *skb, + const void *daddr); static void ipv4_confirm_neigh(const struct dst_entry *dst, const void *daddr); static struct dst_ops ipv4_dst_ops = {
@@ -163,7 +163,7 @@ static struct dst_ops ipv4_dst_ops = { .update_pmtu = ip_rt_update_pmtu, .redirect = ip_do_redirect, .local_out = __ip_local_out, - .neigh_lookup = ipv4_neigh_lookup, + .neigh_lookup = ipv4_dst_neigh_lookup, .confirm_neigh = ipv4_confirm_neigh, };
@@ -409,9 +409,9 @@ void rt_cache_flush(struct net *net) rt_genid_bump_ipv4(net); } -static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst, - struct sk_buff *skb, - const void *daddr) +static struct neighbour *ipv4_dst_neigh_lookup(const struct dst_entry *dst, + struct sk_buff *skb, + const void *daddr) { const struct rtable *rt = container_of(dst, struct rtable, dst); struct net_device *dev;
@@ -2910,7 +2910,7 @@ struct rtable *ip_route_output_key_hash_rcu(struct net *net, struct flowi4 *fl4, static struct dst_ops ipv4_dst_blackhole_ops = { .family = AF_INET, .default_advmss = ipv4_default_advmss, - .neigh_lookup = ipv4_neigh_lookup, + .neigh_lookup = ipv4_dst_neigh_lookup, .check = dst_blackhole_check, .cow_metrics = dst_blackhole_cow_metrics, .update_pmtu = dst_blackhole_update_pmtu,
--
2.56.0.rc1.315.gc6ed9934b7-goog