On Tue, Jan 27, 2015 at 7:35 AM, Thomas Graf <tg...@noironetworks.com> wrote:
> This brings the compat version of vxlan_udp_encap_recv() and
> vxlan_xmit_skb() in line with upstream commit:
>
> commit 3bf3947526c1053ddf2523f261395d682718f56c
> Author: Tom Herbert <therb...@google.com>
> Date: Thu Jan 8 12:31:18 2015 -0800
>
> vxlan: Improve support for header flags
>
> This patch cleans up the header flags of VXLAN in anticipation of
> defining some new ones:
>
> - Move header related definitions from vxlan.c to vxlan.h
> - Change VXLAN_FLAGS to be VXLAN_HF_VNI (only currently defined flag)
> - Move check for unknown flags to after we find vxlan_sock, this
> assumes that some flags may be processed based on tunnel
> configuration
> - Add a comment about why the stack treating unknown set flags as an
> error instead of ignoring them
>
> Signed-off-by: Tom Herbert <therb...@google.com>
> Signed-off-by: David S. Miller <da...@davemloft.net>
>
> Upstream: 3bf394 ("vxlan: Improve support for header flags")
> Signed-off-by: Thomas Graf <tg...@noironetworks.com>
> ---
> acinclude.m4 | 2 ++
> datapath/linux/compat/include/net/vxlan.h | 14 +++++++++++-
> datapath/linux/compat/vxlan.c | 37
> ++++++++++++++++++++++---------
> 3 files changed, 41 insertions(+), 12 deletions(-)
>
> diff --git a/acinclude.m4 b/acinclude.m4
> index 39ceb50..7db7737 100644
> --- a/acinclude.m4
> +++ b/acinclude.m4
> @@ -387,6 +387,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
>
> OVS_GREP_IFELSE([$KSRC/include/linux/openvswitch.h],
> [openvswitch_handle_frame_hook],
> [OVS_DEFINE([HAVE_RHEL_OVS_HOOK])])
> + OVS_GREP_IFELSE([$KSRC/include/net/vxlan.h], [__NET_VXLAN_H],
> + [OVS_DEFINE([HAVE_NET_VXLAN_H])])
> OVS_GREP_IFELSE([$KSRC/include/net/vxlan.h], [vxlan_xmit_skb])
> OVS_GREP_IFELSE([$KSRC/include/net/vxlan.h], [bool xnet],
> [OVS_DEFINE([HAVE_VXLAN_XMIT_SKB_XNET_ARG])])
> diff --git a/datapath/linux/compat/include/net/vxlan.h
> b/datapath/linux/compat/include/net/vxlan.h
> index 83e9210..f3d93c0 100644
> --- a/datapath/linux/compat/include/net/vxlan.h
> +++ b/datapath/linux/compat/include/net/vxlan.h
> @@ -7,9 +7,21 @@
> #include <net/gre.h>
>
> #include <linux/version.h>
> -#ifdef USE_KERNEL_TUNNEL_API
> +
> +#ifdef HAVE_NET_VXLAN_H
> #include_next <net/vxlan.h>
> +#endif
> +
I do not see need for HAVE_NET_VXLAN_H. Is current check not working?
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
