diff options
author | Changli Gao <xiaosuo@gmail.com> | 2008-07-21 13:00:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-21 13:10:57 -0400 |
commit | 0dbff689c2f299e8f63911247925f2728d087688 (patch) | |
tree | 77a0b4db11d438315e2ef97ce117bbe532774600 /net/ipv4 | |
parent | ae6134bdf3197206fba95563d755d2fa50d90ddd (diff) |
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>
Diffstat (limited to 'net/ipv4')
-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 d2a887fc8d9b..6c6a3cba8d50 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, | |||
240 | This is only required for source (ie. NAT/masq) mappings. | 240 | This is only required for source (ie. NAT/masq) mappings. |
241 | So far, we don't do local source mappings, so multiple | 241 | So far, we don't do local source mappings, so multiple |
242 | manips not an issue. */ | 242 | manips not an issue. */ |
243 | if (maniptype == IP_NAT_MANIP_SRC) { | 243 | if (maniptype == IP_NAT_MANIP_SRC && |
244 | !(range->flags & IP_NAT_RANGE_PROTO_RANDOM)) { | ||
244 | if (find_appropriate_src(orig_tuple, tuple, range)) { | 245 | if (find_appropriate_src(orig_tuple, tuple, range)) { |
245 | pr_debug("get_unique_tuple: Found current src map\n"); | 246 | pr_debug("get_unique_tuple: Found current src map\n"); |
246 | if (!(range->flags & IP_NAT_RANGE_PROTO_RANDOM)) | 247 | if (!nf_nat_used_tuple(tuple, ct)) |
247 | if (!nf_nat_used_tuple(tuple, ct)) | 248 | return; |
248 | return; | ||
249 | } | 249 | } |
250 | } | 250 | } |
251 | 251 | ||