diff options
| author | Alex Elder <aelder@sgi.com> | 2010-02-26 21:34:02 +0100 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-02-26 21:34:02 +0100 |
| commit | 398007f863a4af2b4a5a07219c5a617f1a098115 (patch) | |
| tree | 7589f17bfa6645ee0342048bfaede1391a411f2b /net/ipv4/ipcomp.c | |
| parent | fs/xfs: Correct NULL test (diff) | |
| parent | Linux 2.6.33 (diff) | |
| download | linux-398007f863a4af2b4a5a07219c5a617f1a098115.tar.xz linux-398007f863a4af2b4a5a07219c5a617f1a098115.zip | |
Merge branch 'linux-2.6.33'
Diffstat (limited to 'net/ipv4/ipcomp.c')
| -rw-r--r-- | net/ipv4/ipcomp.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c index 38fbf04150ae..544ce0876f12 100644 --- a/net/ipv4/ipcomp.c +++ b/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 = { |