netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Florian Westphal <fw@strlen.de>
Cc: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org,
	edumazet@google.com
Subject: Re: [PATCH net] netfilter: drop bridge nf reset from nf_reset
Date: Tue, 1 Oct 2019 18:43:26 +0200	[thread overview]
Message-ID: <20191001164326.ifgirwawm52zcr7b@salvia> (raw)
In-Reply-To: <20190929185403.12116-1-fw@strlen.de>

On Sun, Sep 29, 2019 at 08:54:03PM +0200, Florian Westphal wrote:
> 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.

Applied, thanks.

      reply	other threads:[~2019-10-01 16:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-29 18:54 [PATCH net] netfilter: drop bridge nf reset from nf_reset Florian Westphal
2019-10-01 16:43 ` Pablo Neira Ayuso [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191001164326.ifgirwawm52zcr7b@salvia \
    --to=pablo@netfilter.org \
    --cc=edumazet@google.com \
    --cc=fw@strlen.de \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).