mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
This commit is contained in:
commit
2bb4646fce
630 changed files with 12002 additions and 6391 deletions
|
|
@ -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 = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue