summaryrefslogtreecommitdiff
path: root/net/ipv6/route.c
diff options
context:
space:
mode:
authorDavid Ahern <dsahern@gmail.com>2018-04-20 15:37:57 -0700
committerDavid S. Miller <davem@davemloft.net>2018-04-21 16:06:13 -0400
commit6a3e030f08e1b700aa6d1ebdc7ebe4c44a2ef67a (patch)
tree2ba6b6983268db95d9031507ad8725d940d0633e /net/ipv6/route.c
parent1b80f86ed6b0e98a7e3d1e7d547f66163aa8a1af (diff)
downloadlwn-6a3e030f08e1b700aa6d1ebdc7ebe4c44a2ef67a.tar.gz
lwn-6a3e030f08e1b700aa6d1ebdc7ebe4c44a2ef67a.zip
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>
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r--net/ipv6/route.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 884d9cee790f..062dd4d8232c 100644
--- 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);