diff options
| author |   Julian Wiedmann <jwi@linux.ibm.com> | 2020-07-14 16:22:58 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-07-14 14:53:45 -0700 |
| commit | 08e95cae648ef8db998d48c38c4774831da5f869 (patch) | |
| tree | beba52c93a8cbfb5821fd3d16c113061a9ccadce /drivers/s390 | |
| parent | s390/qeth: fine-tune errno when cmds are cancelled (diff) | |
| download | wireguard-linux-08e95cae648ef8db998d48c38c4774831da5f869.tar.xz wireguard-linux-08e95cae648ef8db998d48c38c4774831da5f869.zip | |
s390/qeth: only init the isolation mode when necessary
A newly initialized device defaults to ISOLATION_MODE_NONE, don't bother
with programming this a second time.
Then remove the OSD/OSX check, it's already done in the sysfs path
whenever the user actually changes the configuration.
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/net/qeth_core_main.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 7d51be6665cc..514795c5eaad 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -4663,8 +4663,7 @@ int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback) QETH_CARD_TEXT(card, 4, "setactlo"); - if ((IS_OSD(card) || IS_OSX(card)) && - qeth_adp_supported(card, IPA_SETADP_SET_ACCESS_CONTROL)) { + if (qeth_adp_supported(card, IPA_SETADP_SET_ACCESS_CONTROL)) { rc = qeth_setadpparms_set_access_ctrl(card, card->options.isolation, fallback); if (rc) { @@ -5347,9 +5346,11 @@ retriable: (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; + if (card->options.isolation != ISOLATION_MODE_NONE) { + rc = qeth_set_access_ctrl_online(card, 0); + if (rc) + goto out; + } rc = qeth_init_qdio_queues(card); if (rc) { |