xfrm: consistently use time64_t in xfrm_timer_handler()

For some reason, blamed commit did the right thing in xfrm_policy_timer()
but did not in xfrm_timer_handler()

Fixes: 386c5680e2e8 ("xfrm: use time64_t for in-kernel timestamps")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 89c731f..5f03d1f 100644 (file)
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -577,7 +577,7 @@ static enum hrtimer_restart xfrm_timer_handler(struct hrtimer *me)
        if (x->km.state == XFRM_STATE_EXPIRED)
                goto expired;
        if (x->lft.hard_add_expires_seconds) {
-               long tmo = x->lft.hard_add_expires_seconds +
+               time64_t tmo = x->lft.hard_add_expires_seconds +
                        x->curlft.add_time - now;
                if (tmo <= 0) {
                        if (x->xflags & XFRM_SOFT_EXPIRE) {
@@ -594,7 +594,7 @@ static enum hrtimer_restart xfrm_timer_handler(struct hrtimer *me)
                        next = tmo;
        }
        if (x->lft.hard_use_expires_seconds) {
-               long tmo = x->lft.hard_use_expires_seconds +
+               time64_t tmo = x->lft.hard_use_expires_seconds +
                        (x->curlft.use_time ? : now) - now;
                if (tmo <= 0)
                        goto expired;
@@ -604,7 +604,7 @@ static enum hrtimer_restart xfrm_timer_handler(struct hrtimer *me)
        if (x->km.dying)
                goto resched;
        if (x->lft.soft_add_expires_seconds) {
-               long tmo = x->lft.soft_add_expires_seconds +
+               time64_t tmo = x->lft.soft_add_expires_seconds +
                        x->curlft.add_time - now;
                if (tmo <= 0) {
                        warn = 1;
@@ -616,7 +616,7 @@ static enum hrtimer_restart xfrm_timer_handler(struct hrtimer *me)
                }
        }
        if (x->lft.soft_use_expires_seconds) {
-               long tmo = x->lft.soft_use_expires_seconds +
+               time64_t tmo = x->lft.soft_use_expires_seconds +
                        (x->curlft.use_time ? : now) - now;
                if (tmo <= 0)
                        warn = 1;