diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-03-01 14:24:46 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-03-01 16:43:27 -0800 |
| commit | ef739f1dd3ac1f47b8c81ce9e201aade9813441c (patch) | |
| tree | ad4d729413767e81af0013cbc2721282964627b6 /net/smc | |
| parent | 7282c126f7688f697d33f3b965c29bba67fb4eba (diff) | |
| download | linux-ef739f1dd3ac1f47b8c81ce9e201aade9813441c.tar.gz linux-ef739f1dd3ac1f47b8c81ce9e201aade9813441c.tar.bz2 linux-ef739f1dd3ac1f47b8c81ce9e201aade9813441c.zip | |
net: smc: fix different types in min()
Fix build:
include/linux/minmax.h:45:25: note: in expansion of macro ‘__careful_cmp’
45 | #define min(x, y) __careful_cmp(x, y, <)
| ^~~~~~~~~~~~~
net/smc/smc_tx.c:150:24: note: in expansion of macro ‘min’
150 | corking_size = min(sock_net(&smc->sk)->smc.sysctl_autocorking_size,
| ^~~
Fixes: 12bbb0d163a9 ("net/smc: add sysctl for autocorking")
Link: https://lore.kernel.org/r/20220301222446.1271127-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/smc')
| -rw-r--r-- | net/smc/smc_tx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c index 257dc0d0aeb1..98ca9229fe87 100644 --- a/net/smc/smc_tx.c +++ b/net/smc/smc_tx.c @@ -147,8 +147,8 @@ static bool smc_should_autocork(struct smc_sock *smc) struct smc_connection *conn = &smc->conn; int corking_size; - corking_size = min(sock_net(&smc->sk)->smc.sysctl_autocorking_size, - conn->sndbuf_desc->len >> 1); + corking_size = min_t(unsigned int, conn->sndbuf_desc->len >> 1, + sock_net(&smc->sk)->smc.sysctl_autocorking_size); if (atomic_read(&conn->cdc_pend_tx_wr) == 0 || smc_tx_prepared_sends(conn) > corking_size) |