diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-03 13:54:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-03 13:54:50 -0700 |
| commit | 81ac670a6772001a44f659b4883b3048a8a9d41c (patch) | |
| tree | 697d3e50550711aed6f9c4be38d2015ad48ec1be | |
| parent | c356be057432da1720afb5106f4ff102b6a950a7 (diff) | |
| parent | 5e4a43ceb22a6fd2d372fde923a6a95ef6728fd7 (diff) | |
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: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/smc/smc_core.c | 15 | ||||
| -rw-r--r-- | net/smc/smc_ism.c | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c index 0df85a12651e..317bc2c90fab 100644 --- a/net/smc/smc_core.c +++ b/net/smc/smc_core.c @@ -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; diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c index 967712ba52a0..9cb2df289963 100644 --- a/net/smc/smc_ism.c +++ b/net/smc/smc_ism.c @@ -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); |