projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
ipcomp.c
diff --git
a/net/ipv4/ipcomp.c
b/net/ipv4/ipcomp.c
index f01d1b1aff7f0a08b0020055ae65e26f792a0379..59cb8c7690561f3fc44ecc382557408af53cb5fb 100644
(file)
--- a/
net/ipv4/ipcomp.c
+++ b/
net/ipv4/ipcomp.c
@@
-75,6
+75,7
@@
static struct xfrm_state *ipcomp_tunnel_create(struct xfrm_state *x)
t->props.mode = x->props.mode;
t->props.saddr.a4 = x->props.saddr.a4;
t->props.flags = x->props.flags;
+ t->props.extra_flags = x->props.extra_flags;
memcpy(&t->mark, &x->mark, sizeof(t->mark));
if (xfrm_init_state(t))