On Sat, Apr 25, 2015 at 1:08 AM, Alex Wang <al...@nicira.com> wrote: > diff --git a/datapath/linux/compat/include/net/ip_tunnels.h > b/datapath/linux/compat/include/net/ip_tunnels.h > index bb96ec3..9dfa951 100644 > --- a/datapath/linux/compat/include/net/ip_tunnels.h > +++ b/datapath/linux/compat/include/net/ip_tunnels.h > -bool skb_is_encapsulated(struct sk_buff *skb); > +#define skb_is_encapsulated rpl_skb_is_encapsulated > +bool rpl_skb_is_encapsulated(struct sk_buff *skb);
skb_is_encapsulated() actually isn't an upstream function (despite its name). Maybe we should use an ovs_ prefix instead. > #if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0) > diff --git a/datapath/linux/compat/include/net/net_namespace.h > b/datapath/linux/compat/include/net/net_namespace.h > index be64093..0fbe1de 100644 > --- a/datapath/linux/compat/include/net/net_namespace.h > +++ b/datapath/linux/compat/include/net/net_namespace.h [...] > -int compat_init_net(struct net *net, struct rpl_pernet_operations *pnet); > -void compat_exit_net(struct net *net, struct rpl_pernet_operations *pnet); > +#define compat_init_net rpl_compat_init_net > +int rpl_compat_init_net(struct net *net, struct rpl_pernet_operations *pnet); > +#define compat_exit_net rpl_compat_exit_net > +void rpl_compat_exit_net(struct net *net, struct rpl_pernet_operations > *pnet); These compat functions also aren't upstream, so maybe the same comment about making them ovs_ functions. Otherwise looks good to me though: Acked-by: Jesse Gross <je...@nicira.com> _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
