Commit 8a53058b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'smc-fixes' 



Ursula Braun says:

====================
net/smc: fixes 2019-06-26

here are 2 small smc fixes for the net tree.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 30d8177e 8c33bf1b

net/smc/af_smc.c

+4 −1
Original line number Diff line number Diff line
@@ -2029,7 +2029,7 @@ static int __init smc_init(void) 


	rc = smc_pnet_init();

	if (rc)

		return rc;

		goto out_pernet_subsys;



	rc = smc_llc_init();

	if (rc) {
@@ -2080,6 +2080,9 @@ static int __init smc_init(void) 
	proto_unregister(&smc_proto);

out_pnet:

	smc_pnet_exit();

out_pernet_subsys:

	unregister_pernet_subsys(&smc_net_ops);



	return rc;

}

net/smc/smc_core.c

+3 −0
Original line number Diff line number Diff line
@@ -652,7 +652,10 @@ int smc_conn_create(struct smc_sock *smc, struct smc_init_info *ini) 
		rc = smc_lgr_create(smc, ini);

		if (rc)

			goto out;

		lgr = conn->lgr;

		write_lock_bh(&lgr->conns_lock);

		smc_lgr_register_conn(conn); /* add smc conn to lgr */

		write_unlock_bh(&lgr->conns_lock);

	}

	conn->local_tx_ctrl.common.type = SMC_CDC_MSG_TYPE;

	conn->local_tx_ctrl.len = SMC_WR_TX_SIZE;