On Thu, Dec 10, 2015 at 8:03 PM, Pravin B Shelar <pshe...@nicira.com> wrote: > diff --git a/datapath/linux/compat/include/net/ip_tunnels.h > b/datapath/linux/compat/include/net/ip_tunnels.h > index 7083372..3d952d4 100644 > --- a/datapath/linux/compat/include/net/ip_tunnels.h > +++ b/datapath/linux/compat/include/net/ip_tunnels.h [...] > +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0) > struct sk_buff *ovs_iptunnel_handle_offloads(struct sk_buff *skb, > bool csum_help, int > gso_type_mask, > void (*fix_segment)(struct > sk_buff *)); > @@ -36,8 +36,21 @@ int rpl_iptunnel_pull_header(struct sk_buff *skb, int > hdr_len, __be16 inner_prot > #define ovs_iptunnel_handle_offloads(skb, csum_help, gso_type_mask, > fix_segment) \ > iptunnel_handle_offloads(skb, csum_help, gso_type_mask) > > +/* This macro is to make OVS build happy about declared functions name. */ > +#define rpl_iptunnel_pull_header iptunnel_pull_header > +int rpl_iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 > inner_proto); > + > +#define rpl_iptunnel_xmit iptunnel_xmit > +int rpl_iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff > *skb, > + __be32 src, __be32 dst, __u8 proto, __u8 tos, __u8 ttl, > + __be16 df, bool xnet); > + > #endif /* 3.18 */ > > +#define rpl_iptunnel_handle_offloads iptunnel_handle_offloads > +struct sk_buff *rpl_iptunnel_handle_offloads(struct sk_buff *skb, bool > gre_csum, > + int gso_type_mask);
I think we could move this up into the >=3.18 block since it looks like that is the only place where we call the raw iptunnel_handle_offloads(). Acked-by: Jesse Gross <je...@kernel.org> _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
