From 27b6b1ca9c70bd2cbcf8d43e97e20b16c081188b Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 15 Feb 2010 19:24:30 +0000
Subject: [PATCH] --- yaml --- r: 180607 b: refs/heads/master c:
 10e7454ed7a2da39f1f6255f63d7df27ab4bb67f h: refs/heads/master i:   180605:
 172e99386c51a8aed3ce40002a201cd85b38df37   180603:
 f5de4448fb0bb1d8077aa7b45a882343115865e2   180599:
 a5cbeed4d71821155c952653488f58bb94600003   180591:
 30351659bc8b7dad8a301c59c20c648c4d5198be   180575:
 340eded4e3073291ba19b0c2b1d1dbbd121946f3   180543:
 96dfc2e383757bd722329f6424eb0224456be558   180479:
 ff0406ef0a9aedb9d3101eebca7654bf1e0cbeae v: v3

---
 [refs]                   | 2 +-
 trunk/net/ipv4/ipcomp.c  | 6 +-----
 trunk/net/ipv6/ipcomp6.c | 6 +-----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 74473aa60d17..a8fcdd4d3066 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cab819b5e244e1b853c7b440981e6a960da3bfb
+refs/heads/master: 10e7454ed7a2da39f1f6255f63d7df27ab4bb67f
diff --git a/trunk/net/ipv4/ipcomp.c b/trunk/net/ipv4/ipcomp.c
index 38fbf04150ae..544ce0876f12 100644
--- a/trunk/net/ipv4/ipcomp.c
+++ b/trunk/net/ipv4/ipcomp.c
@@ -124,16 +124,12 @@ static int ipcomp4_init_state(struct xfrm_state *x)
 	if (x->props.mode == XFRM_MODE_TUNNEL) {
 		err = ipcomp_tunnel_attach(x);
 		if (err)
-			goto error_tunnel;
+			goto out;
 	}
 
 	err = 0;
 out:
 	return err;
-
-error_tunnel:
-	ipcomp_destroy(x);
-	goto out;
 }
 
 static const struct xfrm_type ipcomp_type = {
diff --git a/trunk/net/ipv6/ipcomp6.c b/trunk/net/ipv6/ipcomp6.c
index 2f2a5ca2c878..002e6eef9120 100644
--- a/trunk/net/ipv6/ipcomp6.c
+++ b/trunk/net/ipv6/ipcomp6.c
@@ -154,16 +154,12 @@ static int ipcomp6_init_state(struct xfrm_state *x)
 	if (x->props.mode == XFRM_MODE_TUNNEL) {
 		err = ipcomp6_tunnel_attach(x);
 		if (err)
-			goto error_tunnel;
+			goto out;
 	}
 
 	err = 0;
 out:
 	return err;
-error_tunnel:
-	ipcomp_destroy(x);
-
-	goto out;
 }
 
 static const struct xfrm_type ipcomp6_type =