|
@@ -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
|