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>

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 327a74cd6a0d0bdd402eaa005378daa4bdb3453d..dd1481ed8bdb2841c9acba29f80419d660fd1db3 100644 (file)
--- 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 062dd4d8232c01f77d3e72b9498f5a698aa19f5c..2d6fcfe11c827c2950a746d9b4bbab2d0fd380cc 100644 (file)
--- 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;