| From: Andrew Morton <akpm@linux-foundation.org> |
| Subject: a |
| Date: Tue Jul 11 01:50:03 PM PDT 2023 |
| |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| net/netfilter/nf_nat_core.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/net/netfilter/nf_nat_core.c~minmax-add-in_range-macro-fix-3 |
| +++ a/net/netfilter/nf_nat_core.c |
| @@ -327,7 +327,7 @@ static bool l4proto_in_range(const struc |
| /* If we source map this tuple so reply looks like reply_tuple, will |
| * that meet the constraints of range. |
| */ |
| -static int in_range(const struct nf_conntrack_tuple *tuple, |
| +static int tuple_in_range(const struct nf_conntrack_tuple *tuple, |
| const struct nf_nat_range2 *range) |
| { |
| /* If we are supposed to map IPs, then we must be in the |
| @@ -376,7 +376,7 @@ find_appropriate_src(struct net *net, |
| &ct->tuplehash[IP_CT_DIR_REPLY].tuple); |
| result->dst = tuple->dst; |
| |
| - if (in_range(result, range)) |
| + if (tuple_in_range(result, range)) |
| return 1; |
| } |
| } |
| @@ -607,7 +607,7 @@ get_unique_tuple(struct nf_conntrack_tup |
| if (maniptype == NF_NAT_MANIP_SRC && |
| !(range->flags & NF_NAT_RANGE_PROTO_RANDOM_ALL)) { |
| /* try the original tuple first */ |
| - if (in_range(orig_tuple, range)) { |
| + if (tuple_in_range(orig_tuple, range)) { |
| if (!nf_nat_used_tuple(orig_tuple, ct)) { |
| *tuple = *orig_tuple; |
| return; |
| _ |
