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: 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 642211174692b71f2f4e86ee6cc39eae2cc386e1..327a74cd6a0d0bdd402eaa005378daa4bdb3453d 100644 (file)
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -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

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 884d9cee790fcd0a1a58e1e5681fedcbc3e4ad72..062dd4d8232c01f77d3e72b9498f5a698aa19f5c 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -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);