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

net/ipv6: Clean up rt expires helpers 



rt6_clean_expires and rt6_set_expires are no longer used. Removed them.
rt6_update_expires has 1 caller in route.c, so move it from the header.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1b80f86e

include/net/ip6_fib.h

+0 −21
Original line number Diff line number Diff line
@@ -223,27 +223,6 @@ static inline bool fib6_check_expired(const struct fib6_info *f6i) 
	return false;

}



static inline void rt6_clean_expires(struct rt6_info *rt)

{

	rt->rt6i_flags &= ~RTF_EXPIRES;

	rt->dst.expires = 0;

}



static inline void rt6_set_expires(struct rt6_info *rt, unsigned long expires)

{

	rt->dst.expires = expires;

	rt->rt6i_flags |= RTF_EXPIRES;

}



static inline void rt6_update_expires(struct rt6_info *rt0, int timeout)

{

	if (!(rt0->rt6i_flags & RTF_EXPIRES) && rt0->from)

		rt0->dst.expires = rt0->from->expires;



	dst_set_expires(&rt0->dst, timeout);

	rt0->rt6i_flags |= RTF_EXPIRES;

}



/* Function to safely get fn->sernum for passed in rt

 * and store result in passed in cookie.

 * Return true if we can get cookie safely

net/ipv6/route.c

+9 −0
Original line number Diff line number Diff line
@@ -2221,6 +2221,15 @@ static void ip6_link_failure(struct sk_buff *skb) 
	}

}



static void rt6_update_expires(struct rt6_info *rt0, int timeout)

{

	if (!(rt0->rt6i_flags & RTF_EXPIRES) && rt0->from)

		rt0->dst.expires = rt0->from->expires;



	dst_set_expires(&rt0->dst, timeout);

	rt0->rt6i_flags |= RTF_EXPIRES;

}



static void rt6_do_update_pmtu(struct rt6_info *rt, u32 mtu)

{

	struct net *net = dev_net(rt->dst.dev);