diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2005-12-20 01:02:45 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-12-20 01:02:45 +0300 |
| commit | 3dd4bc68fac5df16b6d3ed6ed3c29cf05f29a47e (patch) | |
| tree | 854f73bd7862354eac94b624d436b59fdd5ffecb /net/ipv6/route.c | |
| parent | b03664869aa6f84c3c98a06ac9d6905b195909bc (diff) | |
| download | linux-3dd4bc68fac5df16b6d3ed6ed3c29cf05f29a47e.tar.xz | |
[IPV6]: Fix route lifetime.
The route expiration time is stored in rt6i_expires in jiffies.
The argument of rt6_route_add() for adding a route is not the
expiration time in jiffies nor in clock_t, but the lifetime
(or time left before expiration) in clock_t.
Because of the confusion, we sometimes saw several strange errors
(FAILs) in TAHI IPv6 Ready Logo Phase-2 Self Test.
The symptoms were analyzed by Mitsuru Chinen <CHINEN@jp.ibm.com>.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index a7a537b50595..7c68bfbee361 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -829,7 +829,7 @@ int ip6_route_add(struct in6_rtmsg *rtmsg, struct nlmsghdr *nlh, } rt->u.dst.obsolete = -1; - rt->rt6i_expires = clock_t_to_jiffies(rtmsg->rtmsg_info); + rt->rt6i_expires = jiffies + clock_t_to_jiffies(rtmsg->rtmsg_info); if (nlh && (r = NLMSG_DATA(nlh))) { rt->rt6i_protocol = r->rtm_protocol; } else { |