Commit 195e4aac authored by Eric Dumazet's avatar Eric Dumazet Committed by Steffen Klassert
Browse files

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: 386c5680 ("xfrm: use time64_t for in-kernel timestamps")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent b6ee8963

net/xfrm/xfrm_state.c

+4 −4
Original line number Diff line number Diff line
@@ -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;