diff options
| author | Julian Wiedmann <jwi@linux.ibm.com> | 2020-09-23 11:36:57 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-23 22:07:54 +0300 |
| commit | 7fb7fe5c7bacb1b1189b779f7f81c785bfc964a4 (patch) | |
| tree | 675f2b9cba28732df8b1f0fed45f1e5be58858aa /drivers/s390/net/qeth_l2_main.c | |
| parent | f3380b1edc1dd06d874227570a5fe0fbf50eb607 (diff) | |
| download | linux-7fb7fe5c7bacb1b1189b779f7f81c785bfc964a4.tar.xz | |
s390/qeth: cancel cmds earlier during teardown
Originators of cmd IO typically hold the rtnl or conf_mutex to protect
against a concurrent teardown.
Since qeth_set_offline() already holds the conf_mutex, the main reason
why we still care about cancelling pending cmds is so that they release
the rtnl when we need it ourselves.
So move this step a little earlier into the teardown sequence.
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_l2_main.c')
| -rw-r--r-- | drivers/s390/net/qeth_l2_main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index e12ac32b8b47..cbd1ab71e785 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c @@ -315,10 +315,8 @@ static void qeth_l2_stop_card(struct qeth_card *card) cancel_work_sync(&card->rx_mode_work); qeth_l2_drain_rx_mode_cache(card); - if (card->state == CARD_STATE_SOFTSETUP) { - qeth_clear_ipacmd_list(card); + if (card->state == CARD_STATE_SOFTSETUP) card->state = CARD_STATE_DOWN; - } qeth_qdio_clear_card(card, 0); qeth_drain_output_queues(card); |