Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / drivers / s390 / net / qeth_l3_main.c

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index dd72c3c2016520fddfa81b943e5025d7a16f4398..ed59fedd5922398746d4def415268f369217dc1b 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2064,8 +2064,6 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode)
        QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
 
        qeth_set_allowed_threads(card, 0, 1);
-       if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD))
-               return -ERESTARTSYS;
        if (card->read.state == CH_STATE_UP &&
            card->write.state == CH_STATE_UP &&
            (card->state == CARD_STATE_UP)) {
@@ -2795,7 +2793,6 @@ static int qeth_l3_open(struct net_device *dev)
                return -ENODEV;
        card->data.state = CH_STATE_UP;
        card->state = CARD_STATE_UP;
-       card->dev->flags |= IFF_UP;
        netif_start_queue(dev);
 
        if (!card->lan_online && netif_carrier_ok(dev))
@@ -2809,7 +2806,6 @@ static int qeth_l3_stop(struct net_device *dev)
 
        QETH_DBF_TEXT(TRACE, 4, "qethstop");
        netif_tx_disable(dev);
-       card->dev->flags &= ~IFF_UP;
        if (card->state == CARD_STATE_UP)
                card->state = CARD_STATE_SOFTSETUP;
        return 0;
@@ -3051,11 +3047,6 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
        QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
 
        qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
-       if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD)) {
-               PRINT_WARN("set_online of card %s interrupted by user!\n",
-                          CARD_BUS_ID(card));
-               return -ERESTARTSYS;
-       }
 
        recover_flag = card->state;
        rc = ccw_device_set_online(CARD_RDEV(card));
@@ -3172,11 +3163,7 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,
        if (card->dev && netif_carrier_ok(card->dev))
                netif_carrier_off(card->dev);
        recover_flag = card->state;
-       if (qeth_l3_stop_card(card, recovery_mode) == -ERESTARTSYS) {
-               PRINT_WARN("Stopping card %s interrupted by user!\n",
-                          CARD_BUS_ID(card));
-               return -ERESTARTSYS;
-       }
+       qeth_l3_stop_card(card, recovery_mode);
        rc  = ccw_device_set_offline(CARD_DDEV(card));
        rc2 = ccw_device_set_offline(CARD_WDEV(card));
        rc3 = ccw_device_set_offline(CARD_RDEV(card));
@@ -3218,9 +3205,13 @@ static int qeth_l3_recover(void *ptr)
        if (!rc)
                PRINT_INFO("Device %s successfully recovered!\n",
                           CARD_BUS_ID(card));
-       else
+       else {
+               rtnl_lock();
+               dev_close(card->dev);
+               rtnl_unlock();
                PRINT_INFO("Device %s could not be recovered!\n",
                           CARD_BUS_ID(card));
+       }
        return 0;
 }