diff options
author | Ursula Braun <ubraun@linux.ibm.com> | 2019-10-23 15:44:06 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-10 11:34:46 +0100 |
commit | ee49b7f3a466bc4c57913e419cf419b4f0edb5fd (patch) | |
tree | 62889db5d3c0103cc458dfdfa06f3008ebb5a3ff | |
parent | 129eb19f82d8d1f8afdb5cb39818641809e25507 (diff) | |
download | linux-stable-ee49b7f3a466bc4c57913e419cf419b4f0edb5fd.tar.gz linux-stable-ee49b7f3a466bc4c57913e419cf419b4f0edb5fd.tar.bz2 linux-stable-ee49b7f3a466bc4c57913e419cf419b4f0edb5fd.zip |
net/smc: keep vlan_id for SMC-R in smc_listen_work()
[ Upstream commit ca5f8d2dd5229ccacdd5cfde1ce4d32b0810e454 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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) /* check if RDMA is available */ if (!ism_supported) { /* SMC_TYPE_R or SMC_TYPE_B */ /* prepare RDMA check */ - memset(&ini, 0, sizeof(ini)); ini.is_smcd = false; + ini.ism_dev = NULL; ini.ib_lcl = &pclc->lcl; rc = smc_find_rdma_device(new_smc, &ini); if (rc) { |