diff options
author | Daniel Borkmann <daniel@iogearbox.net> | 2016-03-09 03:00:02 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-03-11 21:14:26 +0100 |
commit | 134611446dc657e1bbc73ca0e4e6b599df687db0 (patch) | |
tree | 4a737866a24d8f515b09acda069ab422fe28344b /net/tipc | |
parent | cisco: enic: Update logging macros and uses (diff) | |
download | linux-134611446dc657e1bbc73ca0e4e6b599df687db0.tar.xz linux-134611446dc657e1bbc73ca0e4e6b599df687db0.zip |
ip_tunnel: add support for setting flow label via collect metadata
This patch extends udp_tunnel6_xmit_skb() to pass in the IPv6 flow label
from call sites. Currently, there's no such option and it's always set to
zero when writing ip6_flow_hdr(). Add a label member to ip_tunnel_key, so
that flow-based tunnels via collect metadata frontends can make use of it.
vxlan and geneve will be converted to add flow label support separately.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-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 } |