1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 847e8797073c..7a7a1b664781 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -849,8 +849,6 @@ static int qeth_l2_open(struct net_device *dev)
         card->state = CARD_STATE_UP;
         netif_start_queue(dev);
 
-        if (!card->lan_online && netif_carrier_ok(dev))
-                netif_carrier_off(dev);
         if (qdio_stop_irq(card->data.ccwdev, 0) >= 0) {
                 napi_enable(&card->napi);
                 napi_schedule(&card->napi);
@@ -1013,13 +1011,14 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                         dev_warn(&card->gdev->dev,
                                 "The LAN is offline\n");
                         card->lan_online = 0;
-                        goto out;
+                        goto contin;
                 }
                 rc = -ENODEV;
                 goto out_remove;
         } else
                 card->lan_online = 1;
 
+contin:
         if ((card->info.type == QETH_CARD_TYPE_OSD) ||
             (card->info.type == QETH_CARD_TYPE_OSX))
                 /* configure isolation level */
@@ -1038,7 +1037,10 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                 goto out_remove;
         }
         card->state = CARD_STATE_SOFTSETUP;
-        netif_carrier_on(card->dev);
+        if (card->lan_online)
+                netif_carrier_on(card->dev);
+        else
+                netif_carrier_off(card->dev);
 
         qeth_set_allowed_threads(card, 0xffffffff, 0);
         if (recover_flag == CARD_STATE_RECOVER) {
@@ -1055,7 +1057,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         }
         /* let user_space know that device is online */
         kobject_uevent(&gdev->dev.kobj, KOBJ_CHANGE);
-out:
         mutex_unlock(&card->conf_mutex);
         mutex_unlock(&card->discipline_mutex);
         return 0;