From dc3258ded188cab75135b43043ace39f78e2a344 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Tue, 24 Feb 2009 23:37:19 -0800
Subject: [PATCH] --- yaml --- r: 134680 b: refs/heads/master c:
 bb80087a9440178bcd8363dc27a486f34786fec3 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv6/sit.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 300df2827b52..a5240bcb5cf3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26d94b46d09c97adb3c78c744c195e74ede699b2
+refs/heads/master: bb80087a9440178bcd8363dc27a486f34786fec3
diff --git a/trunk/net/ipv6/sit.c b/trunk/net/ipv6/sit.c
index d3467e563f02..26915effb3bc 100644
--- a/trunk/net/ipv6/sit.c
+++ b/trunk/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