Commit a269f1a7 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

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: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a3e030f

include/net/ip6_fib.h

+3 −3
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ 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,

static inline bool fib6_get_cookie_safe(const struct fib6_info *f6i,

					u32 *cookie)

{

	struct fib6_node *fn;
@@ -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;

}

net/ipv6/route.c

+2 −2
Original line number Diff line number Diff line
@@ -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;