diff options
| author | Wei Yongjun <yjwei@cn.fujitsu.com> | 2009-02-24 23:36:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 23:36:47 -0800 |
| commit | 26d94b46d09c97adb3c78c744c195e74ede699b2 (patch) | |
| tree | 12cbfb8810d122defb0aa3b8f3ee87ef23cdb6e1 /net | |
| parent | da6185d8743704bf7647c0aedaf8c7879d8f3cab (diff) | |
| download | linux-3.10-26d94b46d09c97adb3c78c744c195e74ede699b2.tar.gz linux-3.10-26d94b46d09c97adb3c78c744c195e74ede699b2.tar.bz2 linux-3.10-26d94b46d09c97adb3c78c744c195e74ede699b2.zip | |
ipip: used time_before for comparing jiffies
The functions time_before is more robust for comparing
jiffies against other values.
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ipip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index c49c4ecfb15..9054139795a 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -327,7 +327,7 @@ static int ipip_err(struct sk_buff *skb, u32 info) if (t->parms.iph.ttl == 0 && type == ICMP_TIME_EXCEEDED) goto out; - if (jiffies - t->err_time < IPTUNNEL_ERR_TIMEO) + if (time_before(jiffies, t->err_time + IPTUNNEL_ERR_TIMEO)) t->err_count++; else t->err_count = 1; @@ -466,7 +466,8 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) } if (tunnel->err_count > 0) { - if (jiffies - tunnel->err_time < IPTUNNEL_ERR_TIMEO) { + if (time_before(jiffies, + tunnel->err_time + IPTUNNEL_ERR_TIMEO)) { tunnel->err_count--; dst_link_failure(skb); } else |