Message ID | 20240824074033.2134514-4-lihongbo22@huawei.com (mailing list archive) |
---|---|
State | Not Applicable |
Delegated to: | Johannes Berg |
Headers | show |
Series | Use max/min to simplify the code | expand |
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index cf377377b52d..f35aba4c3b0e 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -282,7 +282,7 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc, /* Our caller is responsible for freeing ipc->opt */ err = ip_options_get(net, &ipc->opt, KERNEL_SOCKPTR(CMSG_DATA(cmsg)), - err < 40 ? err : 40); + min(40, err)); if (err) return err; break;
The following Coccinelle/coccicheck warning reported by minmax.cocci: WARNING opportunity for min() Let's use min() to simplify the code and fix the warning. Signed-off-by: Hongbo Li <lihongbo22@huawei.com> --- net/ipv4/ip_sockglue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)