diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-13 23:52:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-13 23:52:39 -0400 |
| commit | 4ae127d1b6c71f9240dd4245f240e6dd8fc98014 (patch) | |
| tree | b7aa27b3e0c655f4613fe2146cb57d7f69e421f6 /net/ipv6/route.c | |
| parent | 875ec4333b99144e2589e900a0bcd2c25c757b27 (diff) | |
| parent | 7775c9753b94fe429dc4323360d6502c95e0dd6e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smc911x.c
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index edae81319b51..efe036aa3dd1 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
| @@ -2194,8 +2194,12 @@ static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt, | |||
| 2194 | 2194 | ||
| 2195 | NLA_PUT_U32(skb, RTA_PRIORITY, rt->rt6i_metric); | 2195 | NLA_PUT_U32(skb, RTA_PRIORITY, rt->rt6i_metric); |
| 2196 | 2196 | ||
| 2197 | expires = (rt->rt6i_flags & RTF_EXPIRES) ? | 2197 | if (!(rt->rt6i_flags & RTF_EXPIRES)) |
| 2198 | rt->rt6i_expires - jiffies : 0; | 2198 | expires = 0; |
| 2199 | else if (rt->rt6i_expires - jiffies < INT_MAX) | ||
| 2200 | expires = rt->rt6i_expires - jiffies; | ||
| 2201 | else | ||
| 2202 | expires = INT_MAX; | ||
| 2199 | 2203 | ||
| 2200 | if (rtnl_put_cacheinfo(skb, &rt->u.dst, 0, 0, 0, | 2204 | if (rtnl_put_cacheinfo(skb, &rt->u.dst, 0, 0, 0, |
| 2201 | expires, rt->u.dst.error) < 0) | 2205 | expires, rt->u.dst.error) < 0) |