netfilter: drop bridge nf reset from nf_reset
authorFlorian Westphal <fw@strlen.de>
Sun, 29 Sep 2019 18:54:03 +0000 (20:54 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 1 Oct 2019 16:42:15 +0000 (18:42 +0200)
commit895b5c9f206eb7d25dc1360a8ccfc5958895eb89
tree509162fdc985cf083ca5f06732d46eadb308c6d9
parent9cfc370240c31c7f31f445e69190dd15be8e5d7d
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>
31 files changed:
drivers/net/ppp/pptp.c
drivers/net/tun.c
drivers/net/virtio_net.c
drivers/net/vrf.c
drivers/net/wireless/mac80211_hwsim.c
drivers/staging/octeon/ethernet-tx.c
include/linux/skbuff.h
net/batman-adv/soft-interface.c
net/core/skbuff.c
net/dccp/ipv4.c
net/ipv4/ip_input.c
net/ipv4/ipmr.c
net/ipv4/netfilter/nf_dup_ipv4.c
net/ipv4/raw.c
net/ipv4/tcp_ipv4.c
net/ipv4/udp.c
net/ipv6/ip6_input.c
net/ipv6/netfilter/nf_dup_ipv6.c
net/ipv6/raw.c
net/l2tp/l2tp_core.c
net/l2tp/l2tp_eth.c
net/l2tp/l2tp_ip.c
net/l2tp/l2tp_ip6.c
net/netfilter/ipvs/ip_vs_xmit.c
net/openvswitch/vport-internal_dev.c
net/packet/af_packet.c
net/sctp/input.c
net/xfrm/xfrm_input.c
net/xfrm/xfrm_interface.c
net/xfrm/xfrm_output.c
net/xfrm/xfrm_policy.c