diff --git a/[refs] b/[refs] index e14d24580e6e..3d8b2c9ec1ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8d9605243280f1870dd2c6c37a735b925c15f3c +refs/heads/master: 8fcbc63701b01e913e6a13937f765fabf9c969c5 diff --git a/trunk/net/xfrm/xfrm_state.c b/trunk/net/xfrm/xfrm_state.c index d70f85eb7864..9414b9c5b1e4 100644 --- a/trunk/net/xfrm/xfrm_state.c +++ b/trunk/net/xfrm/xfrm_state.c @@ -1345,6 +1345,8 @@ int xfrm_state_update(struct xfrm_state *x) xfrm_state_check_expire(x1); err = 0; + x->km.state = XFRM_STATE_DEAD; + __xfrm_state_put(x); } spin_unlock_bh(&x1->lock);