Skip to contentSkip to conversation

sit: used time_before for comparing jiffies

PATCH Applied Wei Yongjun 2 participants 2 messages Feb 24, 2009 – Feb 25, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 3/3 sit: used time_before for comparing jiffies

The functions time_before is more robust for comparing jiffies against other values.

---
 net/ipv6/sit.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
net/ipv6/sit.c +1 -1
index d3467e5..26915ef 100644
@@ -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

Signature · 1 line
1.5.3.8