Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (33 commits)
  [S390] s390: hibernation support for s390
  [S390] pm: dcssblk power management callbacks.
  [S390] pm: monreader power management callbacks.
  [S390] pm: monwriter power management callbacks.
  [S390] pm: memory hotplug power management callbacks
  [S390] pm: con3270 power management callbacks.
  [S390] pm: smsgiucv power management callbacks.
  [S390] pm: hvc_iucv power management callbacks
  [S390] PM: af_iucv power management callbacks.
  [S390] pm: netiucv power management callbacks.
  [S390] pm: iucv power management callbacks.
  [S390] iucv: establish reboot notifier
  [S390] pm: power management support for SCLP drivers.
  [S390] pm: tape power management callbacks
  [S390] pm: vmlogrdr power management callbacks
  [S390] pm: vmur driver power management callbacks
  [S390] pm: appldata power management callbacks
  [S390] pm: vmwatchdog power management callbacks.
  [S390] pm: zfcp driver power management callbacks
  [S390] pm: claw driver power management callbacks
  ...

1 files changed, 51 insertions, 1 deletions

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 6f2386e9d6e2..54872406864e 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/net/qeth_l3_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>,
@@ -3283,12 +3283,62 @@ static void qeth_l3_shutdown(struct ccwgroup_device *gdev)
         qeth_clear_qdio_buffers(card);
 }
 
+static int qeth_l3_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_l3_set_offline(card->gdev, 1);
+        } else
+                __qeth_l3_set_offline(card->gdev, 0);
+        return 0;
+}
+
+static int qeth_l3_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_l3_set_online(card->gdev, 1);
+                if (rc) {
+                        if (card->dev) {
+                                rtnl_lock();
+                                dev_close(card->dev);
+                                rtnl_unlock();
+                        }
+                }
+        } else
+                rc = __qeth_l3_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_l3_ccwgroup_driver = {
         .probe = qeth_l3_probe_device,
         .remove = qeth_l3_remove_device,
         .set_online = qeth_l3_set_online,
         .set_offline = qeth_l3_set_offline,
         .shutdown = qeth_l3_shutdown,
+        .freeze = qeth_l3_pm_suspend,
+        .thaw = qeth_l3_pm_resume,
+        .restore = qeth_l3_pm_resume,
 };
 EXPORT_SYMBOL_GPL(qeth_l3_ccwgroup_driver);