diff options
author | Ursula Braun <ubraun@linux.ibm.com> | 2019-10-23 09:44:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-10-25 22:18:21 -0400 |
commit | ca5f8d2dd5229ccacdd5cfde1ce4d32b0810e454 (patch) | |
tree | 0acb73be9354c41816a62e3b01fb34d94ba5f203 | |
parent | f536dffc0b79738c3104af999318279dccbaa261 (diff) |
net/smc: keep vlan_id for SMC-R in smc_listen_work()
Creating of an SMC-R connection with vlan-id fails, because
smc_listen_work() determines the vlan_id of the connection,
saves it in struct smc_init_info ini, but clears the ini area
again if SMC-D is not applicable.
This patch just resets the ISM device before investigating
SMC-R availability.
Fixes: bc36d2fc93eb ("net/smc: consolidate function parameters")
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/smc/af_smc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index d9566e84f2f9..cea3c36ea0da 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c | |||
@@ -1298,8 +1298,8 @@ static void smc_listen_work(struct work_struct *work) | |||
1298 | /* check if RDMA is available */ | 1298 | /* check if RDMA is available */ |
1299 | if (!ism_supported) { /* SMC_TYPE_R or SMC_TYPE_B */ | 1299 | if (!ism_supported) { /* SMC_TYPE_R or SMC_TYPE_B */ |
1300 | /* prepare RDMA check */ | 1300 | /* prepare RDMA check */ |
1301 | memset(&ini, 0, sizeof(ini)); | ||
1302 | ini.is_smcd = false; | 1301 | ini.is_smcd = false; |
1302 | ini.ism_dev = NULL; | ||
1303 | ini.ib_lcl = &pclc->lcl; | 1303 | ini.ib_lcl = &pclc->lcl; |
1304 | rc = smc_find_rdma_device(new_smc, &ini); | 1304 | rc = smc_find_rdma_device(new_smc, &ini); |
1305 | if (rc) { | 1305 | if (rc) { |