[ovs-dev] [PATCH 1/2] udptunnel: Kernel 3.20 doesn't exist.

[Simon Horman]

On Sat, Apr 25, 2015 at 05:40:29PM -0700, Jesse Gross wrote:
> When the UDP tunnel compat code was written, it backported some
> functions that were slated to be in the next kernel release, then
> called 3.20. However, this was ultimately released as 4.0 instead.
> 
> Signed-off-by: Jesse Gross <jesse at nicira.com>

Reviewed-by: Simon Horman <simon.horman at netronome.com>

> ---
>  datapath/linux/compat/include/net/udp_tunnel.h | 4 ++--
>  datapath/linux/compat/udp_tunnel.c             | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/datapath/linux/compat/include/net/udp_tunnel.h b/datapath/linux/compat/include/net/udp_tunnel.h
> index 6c25ca5..3e831ae 100644
> --- a/datapath/linux/compat/include/net/udp_tunnel.h
> +++ b/datapath/linux/compat/include/net/udp_tunnel.h
> @@ -4,7 +4,7 @@
>  #include <linux/version.h>
>  #include <linux/kconfig.h>
>  
> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,20,0)
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
>  #include_next <net/udp_tunnel.h>
>  
>  static inline struct sk_buff *
> @@ -102,5 +102,5 @@ static inline struct sk_buff *udp_tunnel_handle_offloads(struct sk_buff *skb,
>  
>  #define udp_tunnel_encap_enable(sock) udp_encap_enable()
>  
> -#endif /* Linux version < 3.20 */
> +#endif /* Linux version < 4.0 */
>  #endif
> diff --git a/datapath/linux/compat/udp_tunnel.c b/datapath/linux/compat/udp_tunnel.c
> index f640113..53ff650 100644
> --- a/datapath/linux/compat/udp_tunnel.c
> +++ b/datapath/linux/compat/udp_tunnel.c
> @@ -1,6 +1,6 @@
>  #include <linux/version.h>
>  
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0)
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
>  
>  #include <linux/module.h>
>  #include <linux/errno.h>
> @@ -172,4 +172,4 @@ void udp_tunnel_sock_release(struct socket *sock)
>  }
>  EXPORT_SYMBOL_GPL(udp_tunnel_sock_release);
>  
> -#endif /* Linux version < 3.20 */
> +#endif /* Linux version < 4.0 */
> -- 
> 1.9.1
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev