From 4031432e346032ee2ef7f108fb680d5fa196d592 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Tue, 6 Feb 2007 14:32:42 -0800
Subject: [PATCH] --- yaml --- r: 46952 b: refs/heads/master c:
 f2f2102d1a1dbc83b5b37b6596cd8374120cbe16 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3da63602b4a2..2c0cde715bb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4337226228e1cfc1d70ee975789c6bd070fb597c
+refs/heads/master: f2f2102d1a1dbc83b5b37b6596cd8374120cbe16
diff --git a/trunk/net/ipv4/xfrm4_policy.c b/trunk/net/ipv4/xfrm4_policy.c
index 011136a95809..699f27ce62ad 100644
--- a/trunk/net/ipv4/xfrm4_policy.c
+++ b/trunk/net/ipv4/xfrm4_policy.c
@@ -175,6 +175,7 @@ __xfrm4_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int
 		afinfo = xfrm_state_get_afinfo(dst_prev->xfrm->props.family);
 		if (!afinfo) {
 			dst = *dst_p;
+			err = -EAFNOSUPPORT;
 			goto error;
 		}
 		dst_prev->output = afinfo->output;