diff options
| author |   Wei Yongjun <yjwei@cn.fujitsu.com> | 2009-02-24 23:34:48 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-02-24 23:34:48 -0800 |
| commit | da6185d8743704bf7647c0aedaf8c7879d8f3cab (patch) | |
| tree | 0d02bf7c2d308646fea12b2d5d617ada457e494c /net/ipv4/ip_gre.c | |
| parent | ipv6: Remove some pointless conditionals before kfree_skb() (diff) | |
| download | linux-dev-da6185d8743704bf7647c0aedaf8c7879d8f3cab.tar.xz linux-dev-da6185d8743704bf7647c0aedaf8c7879d8f3cab.zip | |
gre: used time_before for comparing jiffies
The functions time_before is more robust for comparing
jiffies against other values.
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 07a188afb3ac..e62510d5ea5a 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -491,7 +491,7 @@ static void ipgre_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; @@ -803,7 +803,8 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) #endif 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); |