summaryrefslogtreecommitdiff
path: root/net/smc/smc_core.c
diff options
context:
space:
mode:
authorKarsten Graul <kgraul@linux.ibm.com>2019-04-12 12:57:27 +0200
committerDavid S. Miller <davem@davemloft.net>2019-04-12 10:50:56 -0700
commitfba7e8ef513ce7309d62eb4999b640100b6db06f (patch)
tree290adf22a7dfa7e9f704c64a8a62072e9cec0d70 /net/smc/smc_core.c
parentbc36d2fc93eb2eaef3ab7fbe40d9fc1c5e8bf969 (diff)
net/smc: cleanup of get vlan id
The vlan_id of the underlying CLC socket was retrieved two times during processing of the listen handshaking. Change this to get the vlan id one time in connect and in listen processing, and reuse the id. And add a new CLC DECLINE return code for the case when the retrieval of the vlan id failed. Signed-off-by: Karsten Graul <kgraul@linux.ibm.com> Signed-off-by: Ursula Braun <ubraun@linux.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc/smc_core.c')
-rw-r--r--net/smc/smc_core.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
index a016665abba9..1574c7d7343b 100644
--- a/net/smc/smc_core.c
+++ b/net/smc/smc_core.c
@@ -603,10 +603,6 @@ int smc_conn_create(struct smc_sock *smc, struct smc_init_info *ini)
int rc = 0;
role = smc->listen_smc ? SMC_SERV : SMC_CLNT;
- rc = smc_vlan_by_tcpsk(smc->clcsock, ini);
- if (rc)
- return rc;
-
if (role == SMC_CLNT && ini->srv_first_contact)
/* create new link group as well */
goto create;