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: Zhengchao Shao <shaozhengchao@huawei.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 73a875573e7ad5b7a95f7941e33f0d784a91d16d..83f5a184997162b92ae1009eb6ba862e22338d6d 100644 (file)
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -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);