From 05548c2c45f14f5f30e8b7fe24366120642dce74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Wed, 22 May 2013 01:40:47 +0000
Subject: [PATCH] --- yaml --- r: 376175 b: refs/heads/master c:
 497574c72c9922cf20c12aed15313c389f722fa0 h: refs/heads/master i:   376173:
 73b7c1525ec3b6f944477f811a075e77443d3ea9   376171:
 c96b84b67071c809f7e2aee736177111d0906291   376167:
 17590f9baa59271777e16833ad8b507fe158bf82   376159:
 5b6086f6308cecc0872787ed9adc2002022c879e v: v3

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

diff --git a/[refs] b/[refs]
index 39c65164c106..17874e1abbb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4166625edfd2d808ddda00c7e7e901f4f3b8cc0
+refs/heads/master: 497574c72c9922cf20c12aed15313c389f722fa0
diff --git a/trunk/net/xfrm/xfrm_output.c b/trunk/net/xfrm/xfrm_output.c
index bcfda8921b5b..0cf003dfa8fc 100644
--- a/trunk/net/xfrm/xfrm_output.c
+++ b/trunk/net/xfrm/xfrm_output.c
@@ -64,6 +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);
+			err = -EINVAL;
 			goto error;
 		}