diff options
| author |   David Ahern <dsahern@gmail.com> | 2018-04-20 15:37:58 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-04-21 16:06:13 -0400 |
| commit | a269f1a764bb3abf5c73499fb74bc7ab1c2e986c (patch) | |
| tree | 29c6de763a856a0b50a2bb19c08e95ed3c47c40e | |
| parent | net/ipv6: Clean up rt expires helpers (diff) | |
| download | wireguard-linux-a269f1a764bb3abf5c73499fb74bc7ab1c2e986c.tar.xz wireguard-linux-a269f1a764bb3abf5c73499fb74bc7ab1c2e986c.zip | |
net/ipv6: Rename rt6_get_cookie_safe
rt6_get_cookie_safe takes a fib6_info and checks the sernum of
the node. Update the name to reflect its purpose.
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/ip6_fib.h | 6 | ||||
| -rw-r--r-- | net/ipv6/route.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 327a74cd6a0d..dd1481ed8bdb 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -228,8 +228,8 @@ static inline bool fib6_check_expired(const struct fib6_info *f6i) * Return true if we can get cookie safely * Return false if not */ -static inline bool rt6_get_cookie_safe(const struct fib6_info *f6i, - u32 *cookie) +static inline bool fib6_get_cookie_safe(const struct fib6_info *f6i, + u32 *cookie) { struct fib6_node *fn; bool status = false; @@ -254,7 +254,7 @@ static inline u32 rt6_get_cookie(const struct rt6_info *rt) if (rt->rt6i_flags & RTF_PCPU || (unlikely(!list_empty(&rt->rt6i_uncached)) && rt->from)) - rt6_get_cookie_safe(rt->from, &cookie); + fib6_get_cookie_safe(rt->from, &cookie); return cookie; } diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 062dd4d8232c..2d6fcfe11c82 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2128,7 +2128,7 @@ static bool fib6_check(struct fib6_info *f6i, u32 cookie) { u32 rt_cookie = 0; - if ((f6i && !rt6_get_cookie_safe(f6i, &rt_cookie)) || + if ((f6i && !fib6_get_cookie_safe(f6i, &rt_cookie)) || rt_cookie != cookie) return false; @@ -2142,7 +2142,7 @@ static struct dst_entry *rt6_check(struct rt6_info *rt, u32 cookie) { u32 rt_cookie = 0; - if ((rt->from && !rt6_get_cookie_safe(rt->from, &rt_cookie)) || + if ((rt->from && !fib6_get_cookie_safe(rt->from, &rt_cookie)) || rt_cookie != cookie) return NULL; |