Fix unexpected SA hard expiration after changing date
authorFan Du <fdu@windriver.com>
Mon, 30 Jul 2012 21:43:54 +0000 (21:43 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Aug 2012 07:19:17 +0000 (00:19 -0700)
commite3c0d04750751389d5116267f8cf4687444d9a50
treedfa831b0d4fc388da81ccc0f8f3ce4f62c3916f4
parent1485348d2424e1131ea42efc033cbd9366462b01
Fix unexpected SA hard expiration after changing date

After SA is setup, one timer is armed to detect soft/hard expiration,
however the timer handler uses xtime to do the math. This makes hard
expiration occurs first before soft expiration after setting new date
with big interval. As a result new child SA is deleted before rekeying
the new one.

Signed-off-by: Fan Du <fdu@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/xfrm.h
net/xfrm/xfrm_state.c