diff options
| author | David S. Miller <[email protected]> | 2024-07-31 11:48:59 +0100 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2024-07-31 11:48:59 +0100 |
| commit | 59f726578c9bc0f50011b9e1f50f8bd15ed354a6 (patch) | |
| tree | 65e8058b9cd97d2ea854995d57fc68ed7084de6b | |
| parent | b735154aeb3366b249ab52bbfa0aa8a4c61c9a44 (diff) | |
| parent | 0908503ade5f5fecbdb16c5ce16b2b5ee6107e8d (diff) | |
Merge branch 'smc-cleanups' into main
Zhengchao Shao says:
====================
net/smc: do some cleanups in smc module
Do some cleanups in smc module.
====================
Signed-off-by: David S. Miller <[email protected]>
| -rw-r--r-- | net/smc/af_smc.c | 8 | ||||
| -rw-r--r-- | net/smc/smc_core.c | 4 | ||||
| -rw-r--r-- | net/smc/smc_loopback.h | 1 |
3 files changed, 2 insertions, 11 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index 73a875573e7a..6f82e4d8fda4 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -1466,10 +1466,6 @@ connect_abort: static int smc_connect_check_aclc(struct smc_init_info *ini, struct smc_clc_msg_accept_confirm *aclc) { - if (aclc->hdr.typev1 != SMC_TYPE_R && - aclc->hdr.typev1 != SMC_TYPE_D) - return SMC_CLC_DECL_MODEUNSUPP; - if (aclc->hdr.version >= SMC_V2) { if ((aclc->hdr.typev1 == SMC_TYPE_R && !smcr_indicated(ini->smc_type_v2)) || @@ -1523,10 +1519,6 @@ static int __smc_connect(struct smc_sock *smc) ini->smcd_version &= ~SMC_V1; ini->smcr_version = 0; ini->smc_type_v1 = SMC_TYPE_N; - if (!ini->smcd_version) { - rc = SMC_CLC_DECL_GETVLANERR; - goto fallback; - } } rc = smc_find_proposal_devices(smc, ini); diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c index 3b95828d9976..71fb334d8234 100644 --- a/net/smc/smc_core.c +++ b/net/smc/smc_core.c @@ -2250,7 +2250,7 @@ int smcr_buf_reg_lgr(struct smc_link *lnk) } static struct smc_buf_desc *smcr_new_buf_create(struct smc_link_group *lgr, - bool is_rmb, int bufsize) + int bufsize) { struct smc_buf_desc *buf_desc; @@ -2398,7 +2398,7 @@ static int __smc_buf_create(struct smc_sock *smc, bool is_smcd, bool is_rmb) if (is_smcd) buf_desc = smcd_new_buf_create(lgr, is_rmb, bufsize); else - buf_desc = smcr_new_buf_create(lgr, is_rmb, bufsize); + buf_desc = smcr_new_buf_create(lgr, bufsize); if (PTR_ERR(buf_desc) == -ENOMEM) break; diff --git a/net/smc/smc_loopback.h b/net/smc/smc_loopback.h index 6dd4292dae56..04dc6808d2e1 100644 --- a/net/smc/smc_loopback.h +++ b/net/smc/smc_loopback.h @@ -15,7 +15,6 @@ #define _SMC_LOOPBACK_H #include <linux/device.h> -#include <linux/err.h> #include <net/smc.h> #if IS_ENABLED(CONFIG_SMC_LO) |