libertas: EHS_REMOVE_WAKEUP is not always supported

Certain firmware versions, particularly the 8388 found on the XO-1,
do not support the EHS_REMOVE_WAKEUP command that is used to disable
WOL. Sending this command to the card will return a failure that
would get propagated up the stack and cause suspend to fail.

Instead, fall back to an all-zero wakeup mask.

This fixes http://dev.laptop.org/ticket/9967

Signed-off-by: Deepak Saxena <dsaxena@laptop.org>
Signed-off-by: Daniel Drake <dsd@laptop.org>
[includes fixups by Paul Fox]
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 70745928f3f8..78c4da150a74 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -177,6 +177,14 @@ int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria,
         struct cmd_ds_host_sleep cmd_config;
         int ret;
 
+        /*
+         * Certain firmware versions do not support EHS_REMOVE_WAKEUP command
+         * and the card will return a failure.  Since we need to be
+         * able to reset the mask, in those cases we set a 0 mask instead.
+         */
+        if (criteria == EHS_REMOVE_WAKEUP && !priv->ehs_remove_supported)
+                criteria = 0;
+
         cmd_config.hdr.size = cpu_to_le16(sizeof(cmd_config));
         cmd_config.criteria = cpu_to_le32(criteria);
         cmd_config.gpio = priv->wol_gpio;