diff options
| author |   Julian Wiedmann <jwi@linux.ibm.com> | 2019-10-31 13:42:18 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-10-31 12:32:59 -0700 |
| commit | 9897d583b01525c6fb5dcaaa87263e7f395c905c (patch) | |
| tree | 5e1430b9e2c4021974a1980c2af7b1a42b194cc5 /drivers/s390/net/qeth_core_main.c | |
| parent | s390/qeth: keep IRQ disabled until NAPI is really done (diff) | |
| download | linux-dev-9897d583b01525c6fb5dcaaa87263e7f395c905c.tar.xz linux-dev-9897d583b01525c6fb5dcaaa87263e7f395c905c.zip | |
s390/qeth: consolidate some duplicated HW cmd code
When setting a device online, both subdrivers have the same code to
program the HW trap and Isolation mode. Move that code into a single
place.
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/s390/net/qeth_core_main.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index d4e66707a03f..d51dcb3c5a01 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -4293,7 +4293,6 @@ int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback) } return rc; } -EXPORT_SYMBOL_GPL(qeth_set_access_ctrl_online); void qeth_tx_timeout(struct net_device *dev) { @@ -5009,6 +5008,15 @@ retriable: goto out; } } + + if (!qeth_is_diagass_supported(card, QETH_DIAGS_CMD_TRAP) || + (card->info.hwtrap && qeth_hw_trap(card, QETH_DIAGS_TRAP_ARM))) + card->info.hwtrap = 0; + + rc = qeth_set_access_ctrl_online(card, 0); + if (rc) + goto out; + return 0; out: dev_warn(&card->gdev->dev, "The qeth device driver failed to recover " |