Commit 81ac670a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'smc-next' 



Karsten Graul says:

====================
net/smc: updates 2021-06-02

Please apply the following patch series for smc to netdev's net-next tree.

Both patches are cleanups and remove unnecessary code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c356be05 5e4a43ce

net/smc/smc_core.c

+0 −15
Original line number Diff line number Diff line
@@ -1235,20 +1235,6 @@ static void smc_lgr_free(struct smc_link_group *lgr) 
	kfree(lgr);

}



static void smcd_unregister_all_dmbs(struct smc_link_group *lgr)

{

	int i;



	for (i = 0; i < SMC_RMBE_SIZES; i++) {

		struct smc_buf_desc *buf_desc;



		list_for_each_entry(buf_desc, &lgr->rmbs[i], list) {

			buf_desc->len += sizeof(struct smcd_cdc_msg);

			smc_ism_unregister_dmb(lgr->smcd, buf_desc);

		}

	}

}



static void smc_sk_wake_ups(struct smc_sock *smc)

{

	smc->sk.sk_write_space(&smc->sk);
@@ -1285,7 +1271,6 @@ static void smc_lgr_cleanup(struct smc_link_group *lgr) 
{

	if (lgr->is_smcd) {

		smc_ism_signal_shutdown(lgr);

		smcd_unregister_all_dmbs(lgr);

	} else {

		u32 rsn = lgr->llc_termination_rsn;

net/smc/smc_ism.c

+0 −1
Original line number Diff line number Diff line
@@ -470,7 +470,6 @@ void smcd_unregister_dev(struct smcd_dev *smcd) 
	mutex_unlock(&smcd_dev_list.mutex);

	smcd->going_away = 1;

	smc_smcd_terminate_all(smcd);

	flush_workqueue(smcd->event_wq);

	destroy_workqueue(smcd->event_wq);



	device_del(&smcd->dev);