]> git.proxmox.com Git - ovs.git/commit
datapath: compat: drop bridge nf reset from nf_reset
authorGreg Rose <gvrose8192@gmail.com>
Wed, 9 Oct 2019 21:22:14 +0000 (14:22 -0700)
committerSimon Horman <simon.horman@netronome.com>
Fri, 18 Oct 2019 14:22:12 +0000 (16:22 +0200)
commitefcae7df6c9f43ac542e13f687d03f8c698c181f
treeb775c47fe94a0aa13d03cfbf1054ce5a12fb03b3
parenta2bdad676fb56076ac6dfb9ea598d75c5fbc4745
datapath: compat: drop bridge nf reset from nf_reset

Upstream commmit:
    commit 895b5c9f206eb7d25dc1360a8ccfc5958895eb89
    Author: Florian Westphal <fw@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@google.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@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@strlen.de>
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
acinclude.m4
datapath/linux/compat/include/linux/skbuff.h
datapath/vport-internal_dev.c