diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-19 19:43:36 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-19 19:43:36 -0500 |
| commit | ce7fa1b3f9105873f6e26edb7241c848cab70e4d (patch) | |
| tree | ef88e085dbf26fa10970759876df80adb4a1ae46 /net/ipv6/route.c | |
| parent | d898d485e721db45be555c27df5de03281f2fd05 (diff) | |
| parent | 9bffc4ace1ed875667dbe5b29065d96bec558c62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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, | |||
| 829 | } | 829 | } |
| 830 | 830 | ||
| 831 | rt->u.dst.obsolete = -1; | 831 | rt->u.dst.obsolete = -1; |
| 832 | rt->rt6i_expires = clock_t_to_jiffies(rtmsg->rtmsg_info); | 832 | rt->rt6i_expires = jiffies + clock_t_to_jiffies(rtmsg->rtmsg_info); |
| 833 | if (nlh && (r = NLMSG_DATA(nlh))) { | 833 | if (nlh && (r = NLMSG_DATA(nlh))) { |
| 834 | rt->rt6i_protocol = r->rtm_protocol; | 834 | rt->rt6i_protocol = r->rtm_protocol; |
| 835 | } else { | 835 | } else { |