s390/qeth: don't clear the configured isolation mode

When qeth_set_access_ctrl_online() is called during the device's
initialization and discovers that isolation mode isn't supported, don't
clear the user's currently configured mode.
They intentionally choose to operate the device in this specific mode,
and degrading the isolation is not an option.

Only adjust the configuration when called via sysfs (ie. fallback = 1),
and here follow the common pattern and restore it from prev_isolation.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 514795c5eaadf2d8544b8b4e4d5d14ce651374fd..782a5128ac04b49c3ac01c744f4927f057a47767 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -4663,19 +4663,19 @@ int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback)
 
        QETH_CARD_TEXT(card, 4, "setactlo");
 
-       if (qeth_adp_supported(card, IPA_SETADP_SET_ACCESS_CONTROL)) {
-               rc = qeth_setadpparms_set_access_ctrl(card,
-                       card->options.isolation, fallback);
-               if (rc) {
-                       QETH_DBF_MESSAGE(3, "IPA(SET_ACCESS_CTRL(%d) on device %x: sent failed\n",
-                                        rc, CARD_DEVID(card));
-                       rc = -EOPNOTSUPP;
-               }
-       } else if (card->options.isolation != ISOLATION_MODE_NONE) {
-               card->options.isolation = ISOLATION_MODE_NONE;
-
+       if (!qeth_adp_supported(card, IPA_SETADP_SET_ACCESS_CONTROL)) {
                dev_err(&card->gdev->dev, "Adapter does not "
                        "support QDIO data connection isolation\n");
+               if (fallback)
+                       card->options.isolation = card->options.prev_isolation;
+               return -EOPNOTSUPP;
+       }
+
+       rc = qeth_setadpparms_set_access_ctrl(card, card->options.isolation,
+                                             fallback);
+       if (rc) {
+               QETH_DBF_MESSAGE(3, "IPA(SET_ACCESS_CTRL(%d) on device %x: sent failed\n",
+                                rc, CARD_DEVID(card));
                rc = -EOPNOTSUPP;
        }
        return rc;