This is a pure refactor. Lift the list deletion and key validation code into callers. Subsequent patches will have different requirements for what actions need to accompany psp dev key deletion.
Signed-off-by: Daniel Zahka <[email protected]> --- net/psp/psp_main.c | 7 +++++-- net/psp/psp_sock.c | 11 ++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/net/psp/psp_main.c b/net/psp/psp_main.c index a8534124f626..982c96f74ae3 100644 --- a/net/psp/psp_main.c +++ b/net/psp/psp_main.c @@ -132,8 +132,11 @@ void psp_dev_unregister(struct psp_dev *psd) list_splice_init(&psd->active_assocs, &psd->prev_assocs); list_splice_init(&psd->prev_assocs, &psd->stale_assocs); - list_for_each_entry_safe(pas, next, &psd->stale_assocs, assocs_list) - psp_dev_tx_key_del(psd, pas); + list_for_each_entry_safe(pas, next, &psd->stale_assocs, assocs_list) { + list_del(&pas->assocs_list); + if (pas->tx.spi && !pas->tx_moved) + psp_dev_tx_key_del(psd, pas); + } rcu_assign_pointer(psd->main_netdev->psp_dev, NULL); diff --git a/net/psp/psp_sock.c b/net/psp/psp_sock.c index f429b8b2d8f2..1a97609564e7 100644 --- a/net/psp/psp_sock.c +++ b/net/psp/psp_sock.c @@ -85,9 +85,7 @@ static int psp_dev_tx_key_add(struct psp_dev *psd, struct psp_assoc *pas, void psp_dev_tx_key_del(struct psp_dev *psd, struct psp_assoc *pas) { - if (pas->tx.spi && !pas->tx_moved) - psd->ops->tx_key_del(psd, pas); - list_del(&pas->assocs_list); + psd->ops->tx_key_del(psd, pas); } static void psp_assoc_free(struct work_struct *work) @@ -96,8 +94,11 @@ static void psp_assoc_free(struct work_struct *work) struct psp_dev *psd = pas->psd; mutex_lock(&psd->lock); - if (psd->ops) - psp_dev_tx_key_del(psd, pas); + if (psd->ops) { + list_del(&pas->assocs_list); + if (pas->tx.spi && !pas->tx_moved) + psp_dev_tx_key_del(psd, pas); + } mutex_unlock(&psd->lock); psp_assoc_put(pas->prev); psp_dev_put(psd); -- 2.47.3
