Commit 5a795757 authored by Zhengchao Shao's avatar Zhengchao Shao Committed by David S. Miller
Browse files

net/smc: remove the fallback in __smc_connect 



When the SMC client begins to connect to server, smcd_version is set
to SMC_V1 + SMC_V2. If fail to get VLAN ID, only SMC_V2 information
is left in smcd_version. And smcd_version will not be changed to 0.
Therefore, remove the fallback caused by the failure to get VLAN ID.

Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1018825a

net/smc/af_smc.c

+0 −4
Original line number Diff line number Diff line
@@ -1523,10 +1523,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);