Skip to contentSkip to conversation

ipip: used time_before for comparing jiffies

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

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

PATCH 2/3 ipip: used time_before for comparing jiffies

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

---
 net/ipv4/ipip.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
net/ipv4/ipip.c +1 -1
index 5079dfb..4b50199 100644
@@ -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

Signature · 1 line
1.5.3.8