From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Florian Westphal <fw@strlen.de>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH nf-next] netfilter: ipvs: fix incorrect conflict resolution
Date: Wed, 19 Apr 2017 17:56:56 +0200 [thread overview]
Message-ID: <20170419155656.GC8531@salvia> (raw)
In-Reply-To: <20170418154956.22233-1-fw@strlen.de>
On Tue, Apr 18, 2017 at 05:49:56PM +0200, Florian Westphal wrote:
> The commit ab8bc7ed864b9c4f1fcb00a22bbe4e0f66ce8003
> ("netfilter: remove nf_ct_is_untracked")
> changed the line
> if (ct && !nf_ct_is_untracked(ct) && nfct_nat(ct)) {
> to
> if (ct && nfct_nat(ct)) {
>
> meanwhile, the commit 41390895e50bc4f28abe384c6b35ac27464a20ec
> ("netfilter: ipvs: don't check for presence of nat extension")
> from ipvs-next had changed the same line to
>
> if (ct && !nf_ct_is_untracked(ct) && (ct->status & IPS_NAT_MASK)) {
>
> When ipvs-next got merged into nf-next, the merge resolution took
> the first version, dropping the conversion of nfct_nat().
>
> While this doesn't cause a problem at the moment, it will once we stop
> adding the nat extension by default.
Also applied, thanks.
prev parent reply other threads:[~2017-04-19 15:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-18 15:49 [PATCH nf-next] netfilter: ipvs: fix incorrect conflict resolution Florian Westphal
2017-04-19 15:56 ` 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=20170419155656.GC8531@salvia \
--to=pablo@netfilter.org \
--cc=fw@strlen.de \
--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).