gre: used time_before for comparing jiffies
Subsystems (3)
PATCH 1/3 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 <[email protected]>
--- net/ipv4/ip_gre.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
net/ipv4/ip_gre.c +1 -1
@@ -432,7 +432,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 ;
@@ -744,7 +744,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);
Signature · 1 line
1.5.3.8
From: Wei Yongjun <[email protected]>
Date: Tue, 24 Feb 2009 15:54:42 +0800
Quoted 4 lines
The functions
time_beforeis more robust for comparing jiffies against other values.Signed-off-by Wei Yongjun <[email protected]>
Applied.