diff options
author | David S. Miller <davem@davemloft.net> | 2016-03-11 15:14:27 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-03-11 15:14:27 -0500 |
commit | 627caa9d319d2402f3d41ebd8dd0fde9d41a33a7 (patch) | |
tree | 8ffadc3b984132b1cd44a8ab53e7fce257a8198f /net/tipc/udp_media.c | |
parent | e327f4e193b6a176f4dc3b19faf6371a8917588d (diff) | |
parent | 4018ab1875e0d00b84ac61bc15427136ad55849e (diff) |
Merge branch 'bpf-flow-labels'
Daniel Borkmann says:
====================
BPF support for flow labels
This set adds support for tunnel key flow labels for vxlan
and geneve devices in collect meta data mode and eBPF support
for managing these. For details please see individual patches.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/udp_media.c')
-rw-r--r-- | net/tipc/udp_media.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c index 49b3c2ede7ab..c94f9a15e2cd 100644 --- a/net/tipc/udp_media.c +++ b/net/tipc/udp_media.c @@ -196,7 +196,7 @@ static int tipc_udp_send_msg(struct net *net, struct sk_buff *skb, ttl = ip6_dst_hoplimit(ndst); err = udp_tunnel6_xmit_skb(ndst, ub->ubsock->sk, skb, ndst->dev, &src->ipv6, - &dst->ipv6, 0, ttl, src->udp_port, + &dst->ipv6, 0, ttl, 0, src->udp_port, dst->udp_port, false); #endif } |