Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 134679
b: refs/heads/master
c: 26d94b4
h: refs/heads/master
i:
  134677: 4792927
  134675: 825e590
  134671: 63d1deb
v: v3
  • Loading branch information
Wei Yongjun authored and David S. Miller committed Feb 25, 2009
1 parent 0308630 commit 284fe69
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: da6185d8743704bf7647c0aedaf8c7879d8f3cab
refs/heads/master: 26d94b46d09c97adb3c78c744c195e74ede699b2
5 changes: 3 additions & 2 deletions trunk/net/ipv4/ipip.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 284fe69

Please sign in to comment.