-
- Downloads
netfilter: drop bridge nf reset from nf_reset
commit 174e2381 ("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>
Showing
- drivers/net/ppp/pptp.c 2 additions, 2 deletionsdrivers/net/ppp/pptp.c
- drivers/net/tun.c 1 addition, 1 deletiondrivers/net/tun.c
- drivers/net/virtio_net.c 1 addition, 1 deletiondrivers/net/virtio_net.c
- drivers/net/vrf.c 4 additions, 4 deletionsdrivers/net/vrf.c
- drivers/net/wireless/mac80211_hwsim.c 2 additions, 2 deletionsdrivers/net/wireless/mac80211_hwsim.c
- drivers/staging/octeon/ethernet-tx.c 2 additions, 4 deletionsdrivers/staging/octeon/ethernet-tx.c
- include/linux/skbuff.h 1 addition, 4 deletionsinclude/linux/skbuff.h
- net/batman-adv/soft-interface.c 1 addition, 1 deletionnet/batman-adv/soft-interface.c
- net/core/skbuff.c 1 addition, 1 deletionnet/core/skbuff.c
- net/dccp/ipv4.c 1 addition, 1 deletionnet/dccp/ipv4.c
- net/ipv4/ip_input.c 1 addition, 1 deletionnet/ipv4/ip_input.c
- net/ipv4/ipmr.c 2 additions, 2 deletionsnet/ipv4/ipmr.c
- net/ipv4/netfilter/nf_dup_ipv4.c 1 addition, 1 deletionnet/ipv4/netfilter/nf_dup_ipv4.c
- net/ipv4/raw.c 1 addition, 1 deletionnet/ipv4/raw.c
- net/ipv4/tcp_ipv4.c 1 addition, 1 deletionnet/ipv4/tcp_ipv4.c
- net/ipv4/udp.c 2 additions, 2 deletionsnet/ipv4/udp.c
- net/ipv6/ip6_input.c 1 addition, 1 deletionnet/ipv6/ip6_input.c
- net/ipv6/netfilter/nf_dup_ipv6.c 1 addition, 1 deletionnet/ipv6/netfilter/nf_dup_ipv6.c
- net/ipv6/raw.c 1 addition, 1 deletionnet/ipv6/raw.c
- net/l2tp/l2tp_core.c 1 addition, 1 deletionnet/l2tp/l2tp_core.c
Loading