[ovs-dev] [PATCH 5/5] datapath: compat: drop bridge nf reset from nf_reset

[Yi-Hung Wei]

On Wed, Oct 9, 2019 at 2:25 PM Greg Rose <gvrose8192 at gmail.com> wrote:
>
> Upstream commmit:
>     commit 895b5c9f206eb7d25dc1360a8ccfc5958895eb89
>     Author: Florian Westphal <fw at strlen.de>
>     Date:   Sun Sep 29 20:54:03 2019 +0200
>
>     netfilter: drop bridge nf reset from nf_reset
>
>     commit 174e23810cd31
>     ("sk_buff: drop all skb extensions on free and skb scrubbing") made napi
>     recycle always drop skb extensions.  The additional skb_ext_del() that is
>     performed via nf_reset on napi skb recycle is not needed anymore.
>
>     Most nf_reset() calls in the stack are there so queued skb won't block
>     'rmmod nf_conntrack' indefinitely.
>
>     This removes the skb_ext_del from nf_reset, and renames it to a more
>     fitting nf_reset_ct().
>
>     In a few selected places, add a call to skb_ext_reset to make sure that
>     no active extensions remain.
>
>     I am submitting this for "net", because we're still early in the release
>     cycle.  The patch applies to net-next too, but I think the rename causes
>     needless divergence between those trees.
>
>     Suggested-by: Eric Dumazet <edumazet at google.com>
>     Signed-off-by: Florian Westphal <fw at strlen.de>
>     Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
>
> Added some compat layer fixups for nf_reset_ct.  This is just a portion
> of the upstream commit that applies to openvswitch.
>
> Cc: Florian Westphal <fw at strlen.de>
> Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
> ---
Thanks for the backport.

Acked-by: Yi-Hung Wei <yihung.wei at gmail.com>