From f9f243dd39d3bc4fd78ee9462fadebb2f6037ff6 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Wed, 12 Dec 2007 17:38:56 -0500
Subject: [PATCH] --- yaml --- r: 79191 b: refs/heads/master c:
 ab25ecaea5459f2206dbae25106cff67a24d309e h: refs/heads/master i:   79189:
 084b4279fd270409b503f50bd55134edca126925   79187:
 3b5b40fffae4ae4302b4b0011ef0b0a17202923b   79183:
 08a74ac4dd5eb599e7e0e9dedffa60c00386df32 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/net/wireless/libertas/cmd.h  |  2 +
 trunk/drivers/net/wireless/libertas/main.c | 47 ++++++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 00e2bdca0b4f..ab6b2733b58b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3db2bb411512d1ebd6233b3985d98f4fe7ea8a8
+refs/heads/master: ab25ecaea5459f2206dbae25106cff67a24d309e
diff --git a/trunk/drivers/net/wireless/libertas/cmd.h b/trunk/drivers/net/wireless/libertas/cmd.h
index e800295479ba..e44a0db50487 100644
--- a/trunk/drivers/net/wireless/libertas/cmd.h
+++ b/trunk/drivers/net/wireless/libertas/cmd.h
@@ -35,5 +35,7 @@ int lbs_mesh_config(struct lbs_private *priv, int enable);
 
 int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria,
 		       uint8_t gpio, uint8_t gap);
+int lbs_suspend(struct lbs_private *priv);
+int lbs_resume(struct lbs_private *priv);
 
 #endif /* _LBS_CMD_H */
diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c
index dd432ea61947..1ea119ed3d22 100644
--- a/trunk/drivers/net/wireless/libertas/main.c
+++ b/trunk/drivers/net/wireless/libertas/main.c
@@ -820,6 +820,53 @@ static int lbs_thread(void *data)
 	return 0;
 }
 
+static int lbs_suspend_callback(struct lbs_private *priv, unsigned long dummy,
+				struct cmd_header *cmd)
+{
+	lbs_deb_fw("HOST_SLEEP_ACTIVATE succeeded\n");
+
+	netif_device_detach(priv->dev);
+	if (priv->mesh_dev)
+		netif_device_detach(priv->mesh_dev);
+
+	priv->fw_ready = 0;
+	return 0;
+}
+
+
+int lbs_suspend(struct lbs_private *priv)
+{
+	struct cmd_header cmd;
+	int ret;
+
+	memset(&cmd, 0, sizeof(cmd));
+	
+	ret = __lbs_cmd(priv, CMD_802_11_HOST_SLEEP_ACTIVATE, &cmd,
+			sizeof(cmd), lbs_suspend_callback, 0);
+	if (ret)
+		lbs_pr_info("HOST_SLEEP_ACTIVATE failed: %d\n", ret);
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(lbs_suspend);
+
+int lbs_resume(struct lbs_private *priv)
+{
+	priv->fw_ready = 1;
+
+	/* Firmware doesn't seem to give us RX packets any more
+	   until we send it some command. Might as well update */
+	lbs_prepare_and_send_command(priv, CMD_802_11_RSSI, 0,
+				     0, 0, NULL);
+
+	netif_device_attach(priv->dev);
+	if (priv->mesh_dev)
+		netif_device_attach(priv->mesh_dev);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(lbs_resume);
+
 /**
  *  @brief This function downloads firmware image, gets
  *  HW spec from firmware and set basic parameters to