diff options
| author | Changli Gao <xiaosuo@gmail.com> | 2008-07-21 10:00:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-21 10:10:57 -0700 |
| commit | 0dbff689c2f299e8f63911247925f2728d087688 (patch) | |
| tree | 77a0b4db11d438315e2ef97ce117bbe532774600 | |
| parent | ae6134bdf3197206fba95563d755d2fa50d90ddd (diff) | |
| download | op-kernel-dev-0dbff689c2f299e8f63911247925f2728d087688.zip op-kernel-dev-0dbff689c2f299e8f63911247925f2728d087688.tar.gz | |
netfilter: nf_nat_core: eliminate useless find_appropriate_src for IP_NAT_RANGE_PROTO_RANDOM
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/netfilter/nf_nat_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c index d2a887f..6c6a3cb 100644 --- a/net/ipv4/netfilter/nf_nat_core.c +++ b/net/ipv4/netfilter/nf_nat_core.c @@ -240,12 +240,12 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple, This is only required for source (ie. NAT/masq) mappings. So far, we don't do local source mappings, so multiple manips not an issue. */ - if (maniptype == IP_NAT_MANIP_SRC) { + if (maniptype == IP_NAT_MANIP_SRC && + !(range->flags & IP_NAT_RANGE_PROTO_RANDOM)) { if (find_appropriate_src(orig_tuple, tuple, range)) { pr_debug("get_unique_tuple: Found current src map\n"); - if (!(range->flags & IP_NAT_RANGE_PROTO_RANDOM)) - if (!nf_nat_used_tuple(tuple, ct)) - return; + if (!nf_nat_used_tuple(tuple, ct)) + return; } } |
