===== xfrm4_state.c 1.7 vs edited ===== --- 1.7/net/ipv4/xfrm4_state.c 2004-05-24 21:49:33 +10:00 +++ edited/xfrm4_state.c 2004-05-24 21:41:13 +10:00 @@ -98,7 +98,8 @@ 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); ===== xfrm6_state.c 1.9 vs edited ===== --- 1.9/net/ipv6/xfrm6_state.c 2004-05-24 21:49:33 +10:00 +++ edited/xfrm6_state.c 2004-05-24 21:51:19 +10:00 @@ -108,7 +108,8 @@ 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);