diff options
| author | Pravin B Shelar <pshelar@ovn.org> | 2016-07-07 21:49:10 -0700 |
|---|---|---|
| committer | Pravin B Shelar <pshelar@ovn.org> | 2016-07-08 19:27:49 -0700 |
| commit | 3259c4ff757c4d7c297fd149b91d500ba97f0476 (patch) | |
| tree | d7cafb9068ee930b6f07d566ab69160ec9a28de3 /acinclude.m4 | |
| parent | 9dc970e18041950149128071be1f379cb7523619 (diff) | |
| download | openvswitch-3259c4ff757c4d7c297fd149b91d500ba97f0476.tar.gz | |
datapath: backport: ip_tunnel: add support for setting flow label via collect metadata
Update udp_tunnel6_xmit_skb(). Specificaly changes are
related to setting ipv6 label.
Upstream commit:
commit 134611446dc657e1bbc73ca0e4e6b599df687db0
Author: Daniel Borkmann <daniel@iogearbox.net>
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>
Signed-off-by: Pravin B Shelar <pshelar@ovn.org>
Acked-by: Jesse Gross <jesse@kernel.org>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 263c31d79..a596266c3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -432,8 +432,11 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/net/inetpeer.h], [vif], [OVS_DEFINE([HAVE_INETPEER_VIF_SUPPORT])]) - OVS_GREP_IFELSE([$KSRC/include/net/ip_tunnels.h], [iptunnel_pull_offloads], - [OVS_DEFINE([HAVE_METADATA_DST])]) + OVS_FIND_FIELD_IFELSE([$KSRC/include/net/ip_tunnels.h], [ip_tunnel_key], + [label], + [OVS_GREP_IFELSE([$KSRC/include/net/ip_tunnels.h], + [iptunnel_pull_offloads], + [OVS_DEFINE([HAVE_METADATA_DST])])]) OVS_GREP_IFELSE([$KSRC/include/linux/net.h], [sock_create_kern.*net], [OVS_DEFINE([HAVE_SOCK_CREATE_KERN_NET])]) @@ -610,8 +613,6 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/net/udp.h], [udp_v4_check]) OVS_GREP_IFELSE([$KSRC/include/net/udp.h], [udp_set_csum]) OVS_GREP_IFELSE([$KSRC/include/net/udp_tunnel.h], [udp_tunnel_gro_complete]) - OVS_GREP_IFELSE([$KSRC/include/net/udp_tunnel.h], [ipv6_v6only], - [OVS_DEFINE([HAVE_UDP_TUNNEL_IPV6])]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [ignore_df], [OVS_DEFINE([HAVE_IGNORE_DF_RENAME])]) |