[IPSEC]: Use add_timer in find_acq.

diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c
index 74cae3b4b1e609c4a727a581bd9a612e05060928..ed6dbef78eb5d77b57f24dba808ab4929a8fb1da 100644 (file)
--- a/net/ipv4/xfrm4_state.c
+++ b/net/ipv4/xfrm4_state.c
@@ -98,7 +98,8 @@ __xfrm4_find_acq(u8 mode, u32 reqid, u8 proto,
                x0->props.family = AF_INET;
                x0->lft.hard_add_expires_seconds = XFRM_ACQ_EXPIRES;
                xfrm_state_hold(x0);
-               mod_timer(&x0->timer, jiffies + XFRM_ACQ_EXPIRES*HZ);
+               x0->timer.expires = jiffies + XFRM_ACQ_EXPIRES*HZ;
+               add_timer(&x0->timer);
                xfrm_state_hold(x0);
                list_add_tail(&x0->bydst, xfrm4_state_afinfo.state_bydst+h);
                wake_up(&km_waitq);

diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c
index 8b15806eaba75291a9d047a8cd8c64c26e2eb6b2..c72cf83d465fae7c2f455a35ff692ea0293e3df4 100644 (file)
--- a/net/ipv6/xfrm6_state.c
+++ b/net/ipv6/xfrm6_state.c
@@ -108,7 +108,8 @@ __xfrm6_find_acq(u8 mode, u32 reqid, u8 proto,
                x0->props.reqid = reqid;
                x0->lft.hard_add_expires_seconds = XFRM_ACQ_EXPIRES;
                xfrm_state_hold(x0);
-               mod_timer(&x0->timer, jiffies + XFRM_ACQ_EXPIRES*HZ);
+               x0->timer.expires = jiffies + XFRM_ACQ_EXPIRES*HZ;
+               add_timer(&x0->timer);
                xfrm_state_hold(x0);
                list_add_tail(&x0->bydst, xfrm6_state_afinfo.state_bydst+h);
                wake_up(&km_waitq);