From b7528904ef7dc0a638e34588131d8bb3b6562961 Mon Sep 17 00:00:00 2001
From: Tushar Gohad <tgohad@mvista.com>
Date: Thu, 7 Jul 2011 15:38:52 +0000
Subject: [PATCH] --- yaml --- r: 254879 b: refs/heads/master c:
 8fcbc63701b01e913e6a13937f765fabf9c969c5 h: refs/heads/master i:   254877:
 556012f30f422f4d5957018c104c6980fcb7faa7   254875:
 3c7f81008266004a27bf3b3496d2f8505dbf9fa2   254871:
 3c36cbaf0eda64bf4530b423a95550975bfea12b   254863:
 b592bd2c6da01086c79283b4d7b47b636b98df73   254847:
 60275a6f1f015146d39bf1e474403e8491743de6 v: v3

---
 [refs]                      | 2 +-
 trunk/net/xfrm/xfrm_state.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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);