---

yaml --- r: 180607 b: refs/heads/master c: 10e7454 h: refs/heads/master i: 180605: 172e993 180603: f5de444 180599: a5cbeed 180591: 3035165 180575: 340eded 180543: 96dfc2e 180479: ff0406e v: v3
git-mirror · Feb 16, 2010 · 27b6b1c · 27b6b1c
1 parent a5b864c
commit 27b6b1c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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 =