---

yaml
---
r: 203975
b: refs/heads/master
c: c36952e
h: refs/heads/master
i:
  203973: 04c3d22
  203971: 546075f
  203967: dd50236
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8648a1fdb54da1f683784b36a17aa65ea56e931
+refs/heads/master: c36952e524b2b898a3c9e9b137f64d72d43cd393

trunk/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;