Commit 59f72657 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents b735154a 0908503a

net/smc/af_smc.c

+0 −8
Original line number Diff line number Diff line
@@ -1466,10 +1466,6 @@ static int smc_connect_ism(struct smc_sock *smc, 
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);

net/smc/smc_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

net/smc/smc_loopback.h

+0 −1
Original line number Diff line number Diff line
@@ -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)