[ovs-dev] [PATCH] datapath: do not add vlan_hwaccel_push_inside() for kernel >= 3.18.13

[Simon Horman]

On Tue, May 26, 2015 at 04:59:50PM -0700, Ben Pfaff wrote:
> From: Hauke Mehrtens <hauke at hauke-m.de>
> 
> The vlan_hwaccel_push_inside() function was backported in this commit
> to kernel 3.18.13:
> 
> commit a67e2e88342accd49587d9bad72f6dabd7673f7c
> Author: Jiri Pirko <jiri at resnulli.us>
> Date:   Wed Nov 19 14:04:59 2014 +0100
> 
>     vlan: introduce *vlan_hwaccel_push_inside helpers
> 
>     [ Upstream commit 5968250c868ceee680aa77395b24e6ddcae17d36 ]
> 
> Without this patch compilation breaks on kernel >= 3.18.13
> 
> Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
> Signed-off-by: Ben Pfaff <blp at nicira.com>

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

> ---
> I'm passing along this patch which was submitted as an OVS pull request at
> https://github.com/openvswitch/ovs/pull/48
> 
> diff --git a/datapath/linux/compat/include/linux/if_vlan.h b/datapath/linux/compat/include/linux/if_vlan.h
> index 05c2876..0750bbe 100644
> --- a/datapath/linux/compat/include/linux/if_vlan.h
> +++ b/datapath/linux/compat/include/linux/if_vlan.h
> @@ -52,7 +52,7 @@ static inline struct sk_buff *rpl_vlan_insert_tag_set_proto(struct sk_buff *skb,
>  }
>  #endif
>  
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,13)
>  /*
>   * __vlan_hwaccel_push_inside - pushes vlan tag to the payload
>   * @skb: skbuff to tag
> -- 
> 2.1.3
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev