[ovs-dev] [PATCH] compat: Fix small naming issue

[Yifeng Sun]

LGTM, thanks Greg.

Reviewed-by: Yifeng Sun <pkusunyifeng at gmail.com>

On Wed, Oct 16, 2019 at 1:21 PM Greg Rose <gvrose8192 at gmail.com> wrote:
>
> In commit 057772cf2477 the function is missing the rpl_ prefix
> and the define that replaces the original function should come
> after the function definition.
>
> Fixes: 057772cf2477 ("compat: Backport nf_ct_tmpl_alloc().")
> Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
> ---
>  datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h b/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h
> index 1015801..84cb09e 100644
> --- a/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h
> +++ b/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h
> @@ -7,11 +7,10 @@
>
>  #include <net/netfilter/nf_conntrack_zones.h>
>
> -#define nf_ct_tmpl_alloc rpl_nf_ct_tmpl_alloc
>  /* Released via destroy_conntrack() */
>  static inline struct nf_conn *
> -nf_ct_tmpl_alloc(struct net *net, const struct nf_conntrack_zone *zone,
> -                gfp_t flags)
> +rpl_nf_ct_tmpl_alloc(struct net *net, const struct nf_conntrack_zone *zone,
> +                    gfp_t flags)
>  {
>         struct nf_conn *tmpl;
>
> @@ -32,6 +31,7 @@ out_free:
>         kfree(tmpl);
>         return NULL;
>  }
> +#define nf_ct_tmpl_alloc rpl_nf_ct_tmpl_alloc
>
>  static void rpl_nf_ct_tmpl_free(struct nf_conn *tmpl)
>  {
> --
> 1.8.3.1
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev