aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/sit.c
diff options
context:
space:
mode:
authorWei Yongjun <yjwei@cn.fujitsu.com>2009-02-24 23:37:19 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-24 23:37:19 -0800
commitbb80087a9440178bcd8363dc27a486f34786fec3 (patch)
treef69c7a104077c7638261aad75b3b0e554964e273 /net/ipv6/sit.c
parent26d94b46d09c97adb3c78c744c195e74ede699b2 (diff)
downloadmrst-s0i3-test-bb80087a9440178bcd8363dc27a486f34786fec3.tar.gz
mrst-s0i3-test-bb80087a9440178bcd8363dc27a486f34786fec3.tar.xz
mrst-s0i3-test-bb80087a9440178bcd8363dc27a486f34786fec3.zip
sit: 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/ipv6/sit.c')
-rw-r--r--net/ipv6/sit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index d3467e563f0..26915effb3b 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -454,7 +454,7 @@ static int ipip6_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;
@@ -658,7 +658,8 @@ static int ipip6_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