diff options
| author |   Julian Wiedmann <jwi@linux.ibm.com> | 2020-01-25 16:53:00 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-01-26 15:20:32 +0100 |
| commit | aa3ad3920301f2cf6d406209b14acde0c50f2323 (patch) | |
| tree | 9a1285eba5a6a448c3c2b8b998aef4632b680f57 /drivers/s390/net/qeth_l3_main.c | |
| parent | s390/qeth: shift some bridgeport code around (diff) | |
| download | linux-dev-aa3ad3920301f2cf6d406209b14acde0c50f2323.tar.xz linux-dev-aa3ad3920301f2cf6d406209b14acde0c50f2323.zip | |
s390/qeth: consolidate QDIO queue setup
Move some duplicated logic into a shared code path.
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_l3_main.c')
| -rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index 6c0bffd11138..ee1bdaaa26f6 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c @@ -1184,11 +1184,11 @@ static void qeth_l3_stop_card(struct qeth_card *card) } if (card->state == CARD_STATE_HARDSETUP) { qeth_drain_output_queues(card); - qeth_clear_working_pool_list(card); card->state = CARD_STATE_DOWN; } qeth_qdio_clear_card(card, 0); + qeth_clear_working_pool_list(card); flush_workqueue(card->event_wq); card->info.promisc_mode = 0; } @@ -2097,12 +2097,6 @@ static int qeth_l3_set_online(struct ccwgroup_device *gdev) QETH_CARD_TEXT_(card, 2, "5err%04x", rc); } - rc = qeth_init_qdio_queues(card); - if (rc) { - QETH_CARD_TEXT_(card, 2, "6err%d", rc); - rc = -ENODEV; - goto out_remove; - } card->state = CARD_STATE_SOFTSETUP; qeth_set_allowed_threads(card, 0xffffffff, 0); |