]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
sit: use min
authorkernel test robot <lkp@intel.com>
Sat, 27 Mar 2021 09:29:32 +0000 (10:29 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 7 Jul 2022 15:35:11 +0000 (17:35 +0200)
commit 284fda1eff8a8b27d2cafd7dc8fb423d13720f21 upstream.

Opportunity for min()

Generated by: scripts/coccinelle/misc/minmax.cocci

CC: Denis Efremov <efremov@linux.com>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: kernel test robot <lkp@intel.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv6/sit.c

index 55c999cbe6e9605249082536ff67125d449e5d1f..0b8a2ea0909fdce453f6f1ff05e0af147999fd77 100644 (file)
@@ -316,7 +316,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t,
 
        rcu_read_lock();
 
-       ca = t->prl_count < cmax ? t->prl_count : cmax;
+       ca = min(t->prl_count, cmax);
 
        if (!kp) {
                /* We don't try hard to allocate much memory for