diff options
| author | Kuniyuki Iwashima <kuniyu@google.com> | 2026-10-03 21:23:15 +0000 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-10-07 16:07:03 -0700 |
| commit | 3e33cdcf54ee1143b47b2ee324fc20923ac6fcf3 (patch) | |
| tree | b0f6ac2b961ba13eba79983046220f3732dbc143 | |
| parent | 07cc2b151a262c3e81be6608bb84a4f112fec445 (diff) | |
| download | linux-next-3e33cdcf54ee1143b47b2ee324fc20923ac6fcf3.tar.gz linux-next-3e33cdcf54ee1143b47b2ee324fc20923ac6fcf3.zip | |
ipv6: Rename ip6_neigh_lookup() to __ip6_dst_neigh_lookup().
Later, we will add ipv6_neigh_lookup() as a wrapper for
neigh_lookup(nd_table(net), ...).
The existing ip6_neigh_lookup() is called from ip6_dst_neigh_lookup()
with a gateway address.
Let's rename ip6_neigh_lookup() to __ip6_dst_neigh_lookup().
Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: Fernando Fernandez Mancera <fmancera@suse.de>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/20261003212336.1304988-3-kuniyu@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | include/net/ip6_route.h | 6 | ||||
| -rw-r--r-- | net/ipv6/ndisc.c | 12 | ||||
| -rw-r--r-- | net/ipv6/route.c | 12 |
3 files changed, 15 insertions, 15 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index b9de335b639a..5f47cef0be46 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -437,7 +437,7 @@ u32 ip6_mtu_from_fib6(const struct fib6_result *res, const struct in6_addr *daddr, const struct in6_addr *saddr); -struct neighbour *ip6_neigh_lookup(const struct in6_addr *gw, - struct net_device *dev, struct sk_buff *skb, - const void *daddr); +struct neighbour *__ip6_dst_neigh_lookup(const struct in6_addr *gw, + struct net_device *dev, struct sk_buff *skb, + const void *daddr); #endif diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 12d85d7f8234..e1cbffaa0ad0 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -1359,9 +1359,9 @@ static enum skb_drop_reason ndisc_router_discovery(struct sk_buff *skb) /* routes added from RAs do not use nexthop objects */ rt = rt6_get_dflt_router(net, &ipv6_hdr(skb)->saddr, skb->dev); if (rt) { - neigh = ip6_neigh_lookup(&rt->fib6_nh->fib_nh_gw6, - rt->fib6_nh->fib_nh_dev, NULL, - &ipv6_hdr(skb)->saddr); + neigh = __ip6_dst_neigh_lookup(&rt->fib6_nh->fib_nh_gw6, + rt->fib6_nh->fib_nh_dev, NULL, + &ipv6_hdr(skb)->saddr); if (!neigh) { net_err_ratelimited("RA: %s got default router without neighbour\n", __func__); @@ -1395,9 +1395,9 @@ static enum skb_drop_reason ndisc_router_discovery(struct sk_buff *skb) return reason; } - neigh = ip6_neigh_lookup(&rt->fib6_nh->fib_nh_gw6, - rt->fib6_nh->fib_nh_dev, NULL, - &ipv6_hdr(skb)->saddr); + neigh = __ip6_dst_neigh_lookup(&rt->fib6_nh->fib_nh_gw6, + rt->fib6_nh->fib_nh_dev, NULL, + &ipv6_hdr(skb)->saddr); if (!neigh) { net_err_ratelimited("RA: %s got default router without neighbour\n", __func__); diff --git a/net/ipv6/route.c b/net/ipv6/route.c index b1dcb5e5da88..6bd9659b3870 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -214,10 +214,10 @@ static inline const void *choose_neigh_daddr(const struct in6_addr *p, return daddr; } -struct neighbour *ip6_neigh_lookup(const struct in6_addr *gw, - struct net_device *dev, - struct sk_buff *skb, - const void *daddr) +struct neighbour *__ip6_dst_neigh_lookup(const struct in6_addr *gw, + struct net_device *dev, + struct sk_buff *skb, + const void *daddr) { struct neighbour *n; @@ -236,8 +236,8 @@ static struct neighbour *ip6_dst_neigh_lookup(const struct dst_entry *dst, { const struct rt6_info *rt = dst_rt6_info(dst); - return ip6_neigh_lookup(rt6_nexthop(rt, &in6addr_any), - dst_dev(dst), skb, daddr); + return __ip6_dst_neigh_lookup(rt6_nexthop(rt, &in6addr_any), + dst_dev(dst), skb, daddr); } static void ip6_confirm_neigh(const struct dst_entry *dst, const void *daddr) |