patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / net / ipv4 / xfrm4_state.c

diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c
index cd78fa0..ed6dbef 100644 (file)
--- a/net/ipv4/xfrm4_state.c
+++ b/net/ipv4/xfrm4_state.c
@@ -83,9 +83,7 @@ __xfrm4_find_acq(u8 mode, u32 reqid, u8 proto,
                            break;
                    }
        }
-       if (x0) {
-               xfrm_state_hold(x0);
-       } else if (create && (x0 = xfrm_state_alloc()) != NULL) {
+       if (!x0 && create && (x0 = xfrm_state_alloc()) != NULL) {
                x0->sel.daddr.a4 = daddr->a4;
                x0->sel.saddr.a4 = saddr->a4;
                x0->sel.prefixlen_d = 32;
@@ -100,11 +98,14 @@ __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);
        }
+       if (x0)
+               xfrm_state_hold(x0);
        return x0;
 }