[ovs-dev] [PATCH 01/11] datapath: Account for "rename vlan_tx_* helpers since "tx" is misleading there"

[Pravin Shelar]

On Tue, Jan 27, 2015 at 7:35 AM, Thomas Graf <tgraf at noironetworks.com> wrote:
> Upstream commit:
>     net: rename vlan_tx_* helpers since "tx" is misleading there
>
>     The same macros are used for rx as well. So rename it.
>
>     Signed-off-by: Jiri Pirko <jiri at resnulli.us>
>     Signed-off-by: David S. Miller <davem at davemloft.net>
>
> Upstream: df8a39d ("net: rename vlan_tx_* helpers since "tx" is misleading there")
> Signed-off-by: Thomas Graf <tgraf at noironetworks.com>
> ---
>  acinclude.m4                                  | 1 +
>  datapath/actions.c                            | 4 ++--
>  datapath/datapath.c                           | 4 ++--
>  datapath/flow.c                               | 4 ++--
>  datapath/linux/compat/gso.c                   | 4 ++--
>  datapath/linux/compat/include/linux/if_vlan.h | 5 +++++
>  datapath/linux/compat/netdevice.c             | 2 +-
>  datapath/linux/compat/skbuff-openvswitch.c    | 6 +++---
>  datapath/linux/compat/vxlan.c                 | 6 +++---
>  datapath/vport-geneve.c                       | 6 +++---
>  datapath/vport-gre.c                          | 6 +++---
>  datapath/vport-internal_dev.c                 | 4 ++--
>  datapath/vport.c                              | 2 +-
>  13 files changed, 30 insertions(+), 24 deletions(-)
>
> diff --git a/acinclude.m4 b/acinclude.m4
> index 10ede83..39ceb50 100644
> --- a/acinclude.m4
> +++ b/acinclude.m4
> @@ -289,6 +289,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
>    OVS_GREP_IFELSE([$KSRC/include/linux/etherdevice.h], [ether_addr_copy])
>
>    OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [vlan_set_encap_proto])
> +  OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [skb_vlan_tag_present])
>
>    OVS_GREP_IFELSE([$KSRC/include/linux/in.h], [ipv4_is_multicast])
>    OVS_GREP_IFELSE([$KSRC/include/net/ip.h], [__ip_select_ident.*dst_entry],
...

> diff --git a/datapath/linux/compat/include/linux/if_vlan.h b/datapath/linux/compat/include/linux/if_vlan.h
> index ab13a46..c39dad7 100644
> --- a/datapath/linux/compat/include/linux/if_vlan.h
> +++ b/datapath/linux/compat/include/linux/if_vlan.h
> @@ -135,4 +135,9 @@ static inline int rpl_vlan_insert_tag(struct sk_buff *skb, u16 vlan_tci)
>  }
>  #endif
>
> +#ifndef HAVE_SKB_VLAN_TAG_PRESENT
> +#define skb_vlan_tag_present(skb) vlan_tx_tag_present(skb)
> +#define skb_vlan_tag_get(skb) vlan_tx_tag_get(skb)
> +#endif
> +


No need to search skb_vlan_tag_present(), since it is macro we can use
#undef instead. We should be careful while adding OVS_GREP_IFELSE to
configure script, since it does increase build time.