git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'net-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
[sfrench/cifs-2.6.git]
/
net
/
sched
/
act_tunnel_key.c
diff --git
a/net/sched/act_tunnel_key.c
b/net/sched/act_tunnel_key.c
index a229751ee8c462be33379ca9062bb6bd20c7a74e..85c0d0d5b9da5cdd884028387654090b6a0f7799 100644
(file)
--- a/
net/sched/act_tunnel_key.c
+++ b/
net/sched/act_tunnel_key.c
@@
-459,7
+459,7
@@
static int tunnel_key_init(struct net *net, struct nlattr *nla,
metadata = __ipv6_tun_set_dst(&saddr, &daddr, tos, ttl, dst_port,
0, flags,
- key_id,
0
);
+ key_id,
opts_len
);
} else {
NL_SET_ERR_MSG(extack, "Missing either ipv4 or ipv6 src and dst");
ret = -EINVAL;