From a566cc5f498ec0e41b2afb737ba580503b81b498 Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Wed, 29 Aug 2012 06:49:15 +0000
Subject: [PATCH] --- yaml --- r: 322455 b: refs/heads/master c:
 599901c3e4204e9d9c5a24df5402cd91617a2a26 h: refs/heads/master i:   322453:
 00943a4df4b00115bfda763e291de6fc5523acf9   322451:
 99602143b61a08c8706e2faee3c11014262b2534   322447:
 e0bd8454f0eb41030dcbea337a00693368e7cb6f v: v3

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

diff --git a/[refs] b/[refs]
index 6911abb19aa9..8a73cbb0fb62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48f125ce1cc3ff275f9587b5bf56bf0f90766c7d
+refs/heads/master: 599901c3e4204e9d9c5a24df5402cd91617a2a26
diff --git a/trunk/net/xfrm/xfrm_state.c b/trunk/net/xfrm/xfrm_state.c
index 87cd0e4d4282..210be48d8ae3 100644
--- a/trunk/net/xfrm/xfrm_state.c
+++ b/trunk/net/xfrm/xfrm_state.c
@@ -1994,8 +1994,10 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay)
 		goto error;
 
 	x->outer_mode = xfrm_get_mode(x->props.mode, family);
-	if (x->outer_mode == NULL)
+	if (x->outer_mode == NULL) {
+		err = -EPROTONOSUPPORT;
 		goto error;
+	}
 
 	if (init_replay) {
 		err = xfrm_init_replay(x);