Merge commit 'origin/master' into next

[pandora-kernel.git] / drivers / s390 / net / qeth_l2_main.c

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 9ca6bab..81d7f26 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/net/qeth_l2_main.c
  *
- *    Copyright IBM Corp. 2007
+ *    Copyright IBM Corp. 2007, 2009
  *    Author(s): Utz Bacher <utz.bacher@de.ibm.com>,
  *              Frank Pavlic <fpavlic@de.ibm.com>,
  *              Thomas Spatzier <tspat@de.ibm.com>,
@@ -19,6 +19,7 @@
 #include <linux/etherdevice.h>
 #include <linux/mii.h>
 #include <linux/ip.h>
+#include <linux/list.h>
 
 #include "qeth_core.h"
 
@@ -640,6 +641,7 @@ static void qeth_l2_set_multicast_list(struct net_device *dev)
 {
        struct qeth_card *card = dev->ml_priv;
        struct dev_addr_list *dm;
+       struct netdev_hw_addr *ha;
 
        if (card->info.type == QETH_CARD_TYPE_OSN)
                return ;
@@ -653,8 +655,8 @@ static void qeth_l2_set_multicast_list(struct net_device *dev)
        for (dm = dev->mc_list; dm; dm = dm->next)
                qeth_l2_add_mc(card, dm->da_addr, 0);
 
-       for (dm = dev->uc_list; dm; dm = dm->next)
-               qeth_l2_add_mc(card, dm->da_addr, 1);
+       list_for_each_entry(ha, &dev->uc_list, list)
+               qeth_l2_add_mc(card, ha->addr, 1);
 
        spin_unlock_bh(&card->mclock);
        if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE))
@@ -1139,12 +1141,62 @@ static void qeth_l2_shutdown(struct ccwgroup_device *gdev)
        qeth_clear_qdio_buffers(card);
 }
 
+static int qeth_l2_pm_suspend(struct ccwgroup_device *gdev)
+{
+       struct qeth_card *card = dev_get_drvdata(&gdev->dev);
+
+       if (card->dev)
+               netif_device_detach(card->dev);
+       qeth_set_allowed_threads(card, 0, 1);
+       wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0);
+       if (gdev->state == CCWGROUP_OFFLINE)
+               return 0;
+       if (card->state == CARD_STATE_UP) {
+               card->use_hard_stop = 1;
+               __qeth_l2_set_offline(card->gdev, 1);
+       } else
+               __qeth_l2_set_offline(card->gdev, 0);
+       return 0;
+}
+
+static int qeth_l2_pm_resume(struct ccwgroup_device *gdev)
+{
+       struct qeth_card *card = dev_get_drvdata(&gdev->dev);
+       int rc = 0;
+
+       if (gdev->state == CCWGROUP_OFFLINE)
+               goto out;
+
+       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();
+                       }
+               }
+       } else
+               rc = __qeth_l2_set_online(card->gdev, 0);
+out:
+       qeth_set_allowed_threads(card, 0xffffffff, 0);
+       if (card->dev)
+               netif_device_attach(card->dev);
+       if (rc)
+               dev_warn(&card->gdev->dev, "The qeth device driver "
+                       "failed to recover an error on the device\n");
+       return rc;
+}
+
 struct ccwgroup_driver qeth_l2_ccwgroup_driver = {
        .probe = qeth_l2_probe_device,
        .remove = qeth_l2_remove_device,
        .set_online = qeth_l2_set_online,
        .set_offline = qeth_l2_set_offline,
        .shutdown = qeth_l2_shutdown,
+       .freeze = qeth_l2_pm_suspend,
+       .thaw = qeth_l2_pm_resume,
+       .restore = qeth_l2_pm_resume,
 };
 EXPORT_SYMBOL_GPL(qeth_l2_ccwgroup_driver);