[XFRM]: Handle use_time expiration properly.

e94decde · David S. Miller · 290fdc70 · e94decde
Commit e94decde authored May 31, 2003 by David S. Miller
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

net/xfrm/xfrm_state.c net/xfrm/xfrm_state.c +4 -4

No files found.
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -112,9 +112,9 @@ static void xfrm_timer_handler(unsigned long data)
 		if (tmo < next)
 			next = tmo;
 	}
-	if (x->lft.hard_use_expires_seconds && x->curlft.use_time) {
+	if (x->lft.hard_use_expires_seconds) {
 		long tmo = x->lft.hard_use_expires_seconds +
-			x->curlft.use_time - now;
+			(x->curlft.use_time ? : now) - now;
 		if (tmo <= 0)
 			goto expired;
 		if (tmo < next)
@@ -130,9 +130,9 @@ static void xfrm_timer_handler(unsigned long data)
 		else if (tmo < next)
 			next = tmo;
 	}
-	if (x->lft.soft_use_expires_seconds && x->curlft.use_time) {
+	if (x->lft.soft_use_expires_seconds) {
 		long tmo = x->lft.soft_use_expires_seconds +
-			x->curlft.use_time - now;
+			(x->curlft.use_time ? : now) - now;
 		if (tmo <= 0)
 			warn = 1;
 		else if (tmo < next)