Commit 26d94b46 authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller
Browse files

ipip: used time_before for comparing jiffies 



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

Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent da6185d8

net/ipv4/ipip.c

+3 −2
Original line number Diff line number Diff line
@@ -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