netfilter: nf_nat_core: merge the same lines

proto->unique_tuple() will be called finally, if the previous calls fail. This
patch checks the false condition of (range->flags &IP_NAT_RANGE_PROTO_RANDOM)
instead to avoid duplicate line of code: proto->unique_tuple().

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c
index c7719b283ada4c0e9628dbfd2fbc8a29e8da3fdd..037a3a6599308e1a783d8c832cc3f58d07d74198 100644 (file)
--- a/net/ipv4/netfilter/nf_nat_core.c
+++ b/net/ipv4/netfilter/nf_nat_core.c
@@ -261,14 +261,9 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple,
        rcu_read_lock();
        proto = __nf_nat_proto_find(orig_tuple->dst.protonum);
 
-       /* Change protocol info to have some randomization */
-       if (range->flags & IP_NAT_RANGE_PROTO_RANDOM) {
-               proto->unique_tuple(tuple, range, maniptype, ct);
-               goto out;
-       }
-
        /* Only bother mapping if it's not already in range and unique */
-       if ((!(range->flags & IP_NAT_RANGE_PROTO_SPECIFIED) ||
+       if (!(range->flags & IP_NAT_RANGE_PROTO_RANDOM) &&
+           (!(range->flags & IP_NAT_RANGE_PROTO_SPECIFIED) ||
             proto->in_range(tuple, maniptype, &range->min, &range->max)) &&
            !nf_nat_used_tuple(tuple, ct))
                goto out;