Commit fba7e8ef authored by Karsten Graul's avatar Karsten Graul Committed by David S. Miller
Browse files

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: default avatarKarsten Graul <kgraul@linux.ibm.com>
Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bc36d2fc

net/smc/af_smc.c

+9 −2
Original line number Diff line number Diff line
@@ -699,9 +699,10 @@ static int __smc_connect(struct smc_sock *smc) 
	if (using_ipsec(smc))

		return smc_connect_decline_fallback(smc, SMC_CLC_DECL_IPSEC);



	/* check for VLAN ID */

	/* get vlan id from IP device */

	if (smc_vlan_by_tcpsk(smc->clcsock, &ini))

		return smc_connect_decline_fallback(smc, SMC_CLC_DECL_CNFERR);

		return smc_connect_decline_fallback(smc,

						    SMC_CLC_DECL_GETVLANERR);



	/* check if there is an ism device available */

	if (!smc_check_ism(smc, &ini) &&
@@ -1267,6 +1268,12 @@ static void smc_listen_work(struct work_struct *work) 
		return;

	}



	/* get vlan id from IP device */

	if (smc_vlan_by_tcpsk(new_smc->clcsock, &ini)) {

		smc_listen_decline(new_smc, SMC_CLC_DECL_GETVLANERR, 0);

		return;

	}



	mutex_lock(&smc_server_lgr_pending);

	smc_close_init(new_smc);

	smc_rx_init(new_smc);

net/smc/smc_clc.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define SMC_CLC_DECL_RMBE_EC	0x03050000  /* peer has eyecatcher in RMBE    */

#define SMC_CLC_DECL_OPTUNSUPP	0x03060000  /* fastopen sockopt not supported */

#define SMC_CLC_DECL_DIFFPREFIX	0x03070000  /* IP prefix / subnet mismatch    */

#define SMC_CLC_DECL_GETVLANERR	0x03080000  /* err to get vlan id of ip device*/

#define SMC_CLC_DECL_SYNCERR	0x04000000  /* synchronization error          */

#define SMC_CLC_DECL_PEERDECL	0x05000000  /* peer declined during handshake */

#define SMC_CLC_DECL_INTERR	0x09990000  /* internal error		      */

net/smc/smc_core.c

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE