Florian Westphal 895b5c9f20 netfilter: drop bridge nf reset from nf_reset ... commit 174e23810c ("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>		2019-10-01 18:42:15 +02:00
..
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec	2019-07-05 14:58:22 -07:00
Makefile	xfrm: Add virtual xfrm interfaces	2018-06-23 16:07:25 +02:00
xfrm_algo.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
xfrm_device.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2019-07-05 15:01:15 -07:00
xfrm_hash.c	mm: remove include/linux/bootmem.h	2018-10-31 08:54:16 -07:00
xfrm_hash.h	xfrm: use complete IPv6 addresses for hash	2018-10-15 10:09:18 +02:00
xfrm_inout.h	xfrm: remove input2 indirection from xfrm_mode	2019-04-08 09:14:55 +02:00
xfrm_input.c	netfilter: drop bridge nf reset from nf_reset	2019-10-01 18:42:15 +02:00
xfrm_interface.c	netfilter: drop bridge nf reset from nf_reset	2019-10-01 18:42:15 +02:00
xfrm_ipcomp.c	net: Use skb_frag_off accessors	2019-07-30 14:21:32 -07:00
xfrm_output.c	netfilter: drop bridge nf reset from nf_reset	2019-10-01 18:42:15 +02:00
xfrm_policy.c	netfilter: drop bridge nf reset from nf_reset	2019-10-01 18:42:15 +02:00
xfrm_proc.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
xfrm_replay.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 335	2019-06-05 17:37:06 +02:00
xfrm_state.c	xfrm: remove get_mtu indirection from xfrm_type	2019-07-01 06:16:40 +02:00
xfrm_sysctl.c
xfrm_user.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec	2019-07-05 14:58:22 -07:00