qeth: no recovery after layer mismatch (z/VM NICs)

Depending on their definition in z/VM, virtual devices for z/VM
VSWITCH or GuestLAN must be configured either in layer2 or in
layer3 mode. If qeth detects a layer mismatch, device activation
fails. Trying to recover from this error cannot help; thus
scheduling a recovery should be avoided.
In addition, since recovery is forbidden during online setting of
a qeth device, existence of its network device is guaranteed for all
dev_close() calls in qeth. The corresponding checks can be removed.

Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.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 fa8a519218acc81f1b4af5e252d5cb8fc5beb4a6..834830a4866d85201aec21832468f138d602aca0 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -537,7 +537,8 @@ static void qeth_send_control_data_cb(struct qeth_channel *channel,
                        dev_err(&card->gdev->dev,
                                "The qeth device is not configured "
                                "for the OSI layer required by z/VM\n");
-               qeth_schedule_recovery(card);
+               else
+                       qeth_schedule_recovery(card);
                goto out;
        }
 

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 51fde6f2e0b8ab11affa238fd5adbfe815923ec8..6f1e3036bafd00f1c6c7772a0f861a50c468ed96 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1071,11 +1071,9 @@ static int qeth_l2_recover(void *ptr)
                dev_info(&card->gdev->dev,
                        "Device successfully recovered!\n");
        else {
-               if (card->dev) {
-                       rtnl_lock();
-                       dev_close(card->dev);
-                       rtnl_unlock();
-               }
+               rtnl_lock();
+               dev_close(card->dev);
+               rtnl_unlock();
                dev_warn(&card->gdev->dev, "The qeth device driver "
                        "failed to recover an error on the device\n");
        }
@@ -1129,11 +1127,9 @@ static int qeth_l2_pm_resume(struct ccwgroup_device *gdev)
        if (card->state == CARD_STATE_RECOVER) {
                rc = __qeth_l2_set_online(card->gdev, 1);
                if (rc) {
-                       if (card->dev) {
-                               rtnl_lock();
-                               dev_close(card->dev);
-                               rtnl_unlock();
-                       }
+                       rtnl_lock();
+                       dev_close(card->dev);
+                       rtnl_unlock();
                }
        } else
                rc = __qeth_l2_set_online(card->gdev, 0);

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index cd746da2951e6b30f20215cfea8df521f5c0dc6e..b3b6e872d8066e640e6f9d7bea456625fae83760 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2219,11 +2219,9 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode)
                if (recovery_mode)
                        qeth_l3_stop(card->dev);
                else {
-                       if (card->dev) {
-                               rtnl_lock();
-                               dev_close(card->dev);
-                               rtnl_unlock();
-                       }
+                       rtnl_lock();
+                       dev_close(card->dev);
+                       rtnl_unlock();
                }
                if (!card->use_hard_stop) {
                        rc = qeth_send_stoplan(card);
@@ -3536,11 +3534,9 @@ static int qeth_l3_pm_resume(struct ccwgroup_device *gdev)
        if (card->state == CARD_STATE_RECOVER) {
                rc = __qeth_l3_set_online(card->gdev, 1);
                if (rc) {
-                       if (card->dev) {
-                               rtnl_lock();
-                               dev_close(card->dev);
-                               rtnl_unlock();
-                       }
+                       rtnl_lock();
+                       dev_close(card->dev);
+                       rtnl_unlock();
                }
        } else
                rc = __qeth_l3_set_online(card->gdev, 0);