Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit da6185d8743704bf7647c0aedaf8c7879d8f3cab

Authored by Wei Yongjun
Committed by David S. Miller
1 parent 800d55f146
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

... ... @@ -491,7 +491,7 @@
491 491 if (t->parms.iph.ttl == 0 && type == ICMP_TIME_EXCEEDED)
492 492 goto out;
493 493  
494   - if (jiffies - t->err_time < IPTUNNEL_ERR_TIMEO)
  494 + if (time_before(jiffies, t->err_time + IPTUNNEL_ERR_TIMEO))
495 495 t->err_count++;
496 496 else
497 497 t->err_count = 1;
... ... @@ -803,7 +803,8 @@
803 803 #endif
804 804  
805 805 if (tunnel->err_count > 0) {
806   - if (jiffies - tunnel->err_time < IPTUNNEL_ERR_TIMEO) {
  806 + if (time_before(jiffies,
  807 + tunnel->err_time + IPTUNNEL_ERR_TIMEO)) {
807 808 tunnel->err_count--;
808 809  
809 810 dst_link_failure(skb);