lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source
This commit is contained in:
David S. Miller
2010-02-16 22:09:29 -08:00
parent 6836b9bdd9 b0483e78e5
commit 2bb4646fce
630 changed files with 12005 additions and 6394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv4/ipcomp.c
View File

@@ -127,16 +127,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 = {