From eadcac4f620c752452867edb3e04c52aac5167d5 Mon Sep 17 00:00:00 2001
From: Li RongQing <roy.qing.li@gmail.com>
Date: Fri, 1 Feb 2013 13:17:16 +0800
Subject: [PATCH] --- yaml --- r: 352457 b: refs/heads/master c:
 fa8599db8f222fd9d351a640074377a841979187 h: refs/heads/master i:   352455:
 704e3a55987b93f21610b6451d210933bd334981 v: v3

---
 [refs]                       | 2 +-
 trunk/net/xfrm/xfrm_output.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 49243e1c057f..93d6dda91dd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e50f84c94b82c3b2d23ac8878012b3b60ea0e96
+refs/heads/master: fa8599db8f222fd9d351a640074377a841979187
diff --git a/trunk/net/xfrm/xfrm_output.c b/trunk/net/xfrm/xfrm_output.c
index 3670526e70b9..bcfda8921b5b 100644
--- a/trunk/net/xfrm/xfrm_output.c
+++ b/trunk/net/xfrm/xfrm_output.c
@@ -64,7 +64,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
 
 		if (unlikely(x->km.state != XFRM_STATE_VALID)) {
 			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATEINVALID);
-			goto error_nolock;
+			goto error;
 		}
 
 		err = xfrm_state_check_expire(x);