From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 3/6] netfilter: nf_nat_snmp_basic: fix duplicates in if/else branches
Date: Wed, 19 Feb 2014 12:41:39 +0100 [thread overview]
Message-ID: <1392810102-13877-4-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1392810102-13877-1-git-send-email-pablo@netfilter.org>
From: FX Le Bail <fx.lebail@yahoo.com>
The solution was found by Patrick in 2.4 kernel sources.
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: Francois-Xavier Le Bail <fx.lebail@yahoo.com>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/ipv4/netfilter/nf_nat_snmp_basic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
index d551e31..7c67667 100644
--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
@@ -1198,8 +1198,8 @@ static int snmp_translate(struct nf_conn *ct,
map.to = NOCT1(&ct->tuplehash[!dir].tuple.dst.u3.ip);
} else {
/* DNAT replies */
- map.from = NOCT1(&ct->tuplehash[dir].tuple.src.u3.ip);
- map.to = NOCT1(&ct->tuplehash[!dir].tuple.dst.u3.ip);
+ map.from = NOCT1(&ct->tuplehash[!dir].tuple.src.u3.ip);
+ map.to = NOCT1(&ct->tuplehash[dir].tuple.dst.u3.ip);
}
if (map.from == map.to)
--
1.7.10.4
next prev parent reply other threads:[~2014-02-19 11:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-19 11:41 [PATCH 0/6] Netfilter fixes for net Pablo Neira Ayuso
2014-02-19 11:41 ` [PATCH 1/6] netfilter: nft_reject_inet: fix unintended fall-through in switch-statatement Pablo Neira Ayuso
2014-02-19 11:41 ` [PATCH 2/6] netfilter: nft_meta: fix typo "CONFIG_NET_CLS_ROUTE" Pablo Neira Ayuso
2014-02-19 11:41 ` Pablo Neira Ayuso [this message]
2014-02-19 11:41 ` [PATCH 4/6] netfilter: nf_tables: fix nf_trace always-on with XT_TRACE=n Pablo Neira Ayuso
2014-02-19 11:41 ` [PATCH 5/6] netfilter: nf_tables: check if payload length is a power of 2 Pablo Neira Ayuso
2014-02-19 11:41 ` [PATCH 6/6] netfilter: ctnetlink: force null nat binding on insert Pablo Neira Ayuso
2014-02-19 18:16 ` [PATCH 0/6] Netfilter fixes for net David Miller
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=1392810102-13877-4-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.