---

yaml --- r: 376175 b: refs/heads/master c: 497574c h: refs/heads/master i: 376173: 73b7c15 376171: c96b84b 376167: 17590f9 376159: 5b6086f v: v3
git-mirror · May 23, 2013 · 05548c2 · 05548c2
1 parent 621135d
commit 05548c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;
 		}