aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ipcomp6.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-02-17 01:09:29 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-17 01:09:29 -0500
commit2bb4646fce8d09916b351d1a62f98db7cec6fc41 (patch)
treec1f0d002e69868606eca9d1b919835f422892063 /net/ipv6/ipcomp6.c
parent6836b9bdd98e3b500cd49512484df68f46e14659 (diff)
parentb0483e78e5c4c9871fc5541875b3bc006846d46b (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/ipcomp6.c')
-rw-r--r--net/ipv6/ipcomp6.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index a9fbb151bb79..bb42f39c1db8 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -157,16 +157,12 @@ static int ipcomp6_init_state(struct xfrm_state *x)
157 if (x->props.mode == XFRM_MODE_TUNNEL) { 157 if (x->props.mode == XFRM_MODE_TUNNEL) {
158 err = ipcomp6_tunnel_attach(x); 158 err = ipcomp6_tunnel_attach(x);
159 if (err) 159 if (err)
160 goto error_tunnel; 160 goto out;
161 } 161 }
162 162
163 err = 0; 163 err = 0;
164out: 164out:
165 return err; 165 return err;
166error_tunnel:
167 ipcomp_destroy(x);
168
169 goto out;
170} 166}
171 167
172static const struct xfrm_type ipcomp6_type = 168static const struct xfrm_type ipcomp6_type =