diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2022-03-30 16:32:33 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2022-09-06 15:12:46 +0200 |
| commit | c3a0a61e28ec08a1a5e4faefb270b30da5d176c0 (patch) | |
| tree | fd068c981d8606c6be2dc4a12b34391c2cdd3ded | |
| parent | 0f7391991f43b3dcd7d0dc68507c721fea2d9db3 (diff) | |
| download | kernel_replicant_linux-c3a0a61e28ec08a1a5e4faefb270b30da5d176c0.tar.gz kernel_replicant_linux-c3a0a61e28ec08a1a5e4faefb270b30da5d176c0.tar.bz2 kernel_replicant_linux-c3a0a61e28ec08a1a5e4faefb270b30da5d176c0.zip | |
net: sipc: core: fix compilation error
Without that fix we have:
AR net/built-in.a
drivers/net/sipc/core.c: In function 'sipc_receive_callback':
drivers/net/sipc/core.c:462:51: error: macro "min" passed 3 arguments, but takes just 2
462 | len = min(size_t, bufsz, rest_size);
| ^
In file included from ./include/linux/kernel.h:14,
from ./include/linux/skbuff.h:13,
from ./include/linux/ip.h:16,
from drivers/net/sipc/core.c:9:
./include/linux/minmax.h:45: note: macro "min" defined here
45 | #define min(x, y) __careful_cmp(x, y, <)
|
drivers/net/sipc/core.c:462:23: error: 'min' undeclared (first use in this function)
462 | len = min(size_t, bufsz, rest_size);
| ^~~
drivers/net/sipc/core.c:462:23: note: each undeclared identifier is reported only once for each function it appears in
make[3]: *** [scripts/Makefile.build:280: drivers/net/sipc/core.o] Error 1
This was broken by commit 6462f2d54c1f (net: sipc: core: Fix code style)
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
| -rw-r--r-- | drivers/net/sipc/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sipc/core.c b/drivers/net/sipc/core.c index 34135d85de58..f2943fa17623 100644 --- a/drivers/net/sipc/core.c +++ b/drivers/net/sipc/core.c @@ -459,7 +459,7 @@ skip_header_check: /* line 331, sipc4_io_device.c */ while (bufsz > 0) { - len = min(size_t, bufsz, rest_size); + len = min_t(size_t, bufsz, rest_size); len = min_t(size_t, len, skb_tailroom(chan->pending_rx_skb)); len = min_t(size_t, len, MAX_RX_SIZE); |