diff options
| author | Florian Westphal <fw@strlen.de> | 2017-04-18 17:49:56 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-04-19 17:55:17 +0200 |
| commit | be7be6e161a218e92c4e46b97ba59c1e40cfea9c (patch) | |
| tree | 24b0d71b0fd286541141d712c771dba839bb3ba2 /net/netfilter/nf_conntrack_proto_tcp.c | |
| parent | 01026edef9062b7d26ace74a5b4a5a33a2399501 (diff) | |
netfilter: ipvs: fix incorrect conflict resolution
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.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_proto_tcp.c')
0 files changed, 0 insertions, 0 deletions