diff options
| author | Greg Rose <gvrose8192@gmail.com> | 2019-10-09 14:22:14 -0700 |
|---|---|---|
| committer | Simon Horman <simon.horman@netronome.com> | 2019-10-18 16:22:12 +0200 |
| commit | efcae7df6c9f43ac542e13f687d03f8c698c181f (patch) | |
| tree | b775c47fe94a0aa13d03cfbf1054ce5a12fb03b3 /acinclude.m4 | |
| parent | a2bdad676fb56076ac6dfb9ea598d75c5fbc4745 (diff) | |
| download | openvswitch-efcae7df6c9f43ac542e13f687d03f8c698c181f.tar.gz | |
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>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index b3e5f9469..d60016f33 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -742,6 +742,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_FIND_PARAM_IFELSE([$KSRC/include/net/rtnetlink.h], [rtnl_create_link], [extack], [OVS_DEFINE([HAVE_RTNL_CREATE_LINK_TAKES_EXTACK])]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [nf_reset_ct]) # Check for the proto_data_valid member in struct sk_buff. The [^@] # is necessary because some versions of this header remove the |