diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-21 04:38:01 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-21 04:38:01 -0500 |
| commit | d8bcd8e41576809f276fa44be5012568296cce41 (patch) | |
| tree | ec48438ed1a7b3d3794a0a4cc577d0bab69b7f03 /net/ipv6/route.c | |
| parent | 5b2db367a28c12e8dfd0b404d9ea35e948c5d7b3 (diff) | |
| parent | b05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff) | |
| download | op-kernel-dev-d8bcd8e41576809f276fa44be5012568296cce41.zip op-kernel-dev-d8bcd8e41576809f276fa44be5012568296cce41.tar.gz | |
Auto-update from upstream
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 a7a537b..7c68bfb 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 { |
