Hi,
The following patchset contains Netfilter fixes for net:
1) Remove the skb_ext_del from nf_reset, and renames it to a more
fitting nf_reset_ct(). Patch from Florian Westphal.
2) Fix deadlock in nft_connlimit between packet path updates and
the garbage collector.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Thanks.
----------------------------------------------------------------
The following changes since commit 9cfc370240c31c7f31f445e69190dd15be8e5d7d:
Merge tag 'mac80211-for-davem-2019-10-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (2019-10-01 09:28:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD
for you to fetch changes up to 34a4c95abd25ab41fb390b985a08a651b1fa0b0f:
netfilter: nft_connlimit: disable bh on garbage collection (2019-10-01 18:42:15 +0200)
----------------------------------------------------------------
Florian Westphal (1):
netfilter: drop bridge nf reset from nf_reset
Pablo Neira Ayuso (1):
netfilter: nft_connlimit: disable bh on garbage collection
drivers/net/ppp/pptp.c | 4 ++--
drivers/net/tun.c | 2 +-
drivers/net/virtio_net.c | 2 +-
drivers/net/vrf.c | 8 ++++----
drivers/net/wireless/mac80211_hwsim.c | 4 ++--
drivers/staging/octeon/ethernet-tx.c | 6 ++----
include/linux/skbuff.h | 5 +----
net/batman-adv/soft-interface.c | 2 +-
net/core/skbuff.c | 2 +-
net/dccp/ipv4.c | 2 +-
net/ipv4/ip_input.c | 2 +-
net/ipv4/ipmr.c | 4 ++--
net/ipv4/netfilter/nf_dup_ipv4.c | 2 +-
net/ipv4/raw.c | 2 +-
net/ipv4/tcp_ipv4.c | 2 +-
net/ipv4/udp.c | 4 ++--
net/ipv6/ip6_input.c | 2 +-
net/ipv6/netfilter/nf_dup_ipv6.c | 2 +-
net/ipv6/raw.c | 2 +-
net/l2tp/l2tp_core.c | 2 +-
net/l2tp/l2tp_eth.c | 2 +-
net/l2tp/l2tp_ip.c | 2 +-
net/l2tp/l2tp_ip6.c | 2 +-
net/netfilter/ipvs/ip_vs_xmit.c | 2 +-
net/netfilter/nft_connlimit.c | 7 ++++++-
net/openvswitch/vport-internal_dev.c | 2 +-
net/packet/af_packet.c | 4 ++--
net/sctp/input.c | 2 +-
net/xfrm/xfrm_input.c | 2 +-
net/xfrm/xfrm_interface.c | 2 +-
net/xfrm/xfrm_output.c | 2 +-
net/xfrm/xfrm_policy.c | 2 +-
32 files changed, 46 insertions(+), 46 deletions(-)
