3 files changed, 13 insertions, 0 deletions

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index fe5045757356..1c6ec4d61988 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -260,6 +260,7 @@ struct lbs_private {
         u16 psmode;             /* Wlan802_11PowermodeCAM=disable
                                    Wlan802_11PowermodeMAX_PSP=enable */
         u32 psstate;
+        char ps_supported;
         u8 needtowakeup;
 
         struct PS_CMD_ConfirmSleep lbs_ps_confirm_sleep;
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index 4c03e12fd6a3..1aa04076b1ac 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -209,6 +209,11 @@
 #define CMD_TYPE_MAX_PSP                0x0001
 #define CMD_TYPE_FAST_PSP               0x0002
 
+/* Options for CMD_802_11_FW_WAKE_METHOD */
+#define CMD_WAKE_METHOD_UNCHANGED       0x0000
+#define CMD_WAKE_METHOD_COMMAND_INT     0x0001
+#define CMD_WAKE_METHOD_GPIO            0x0002
+
 /* Define action or option for CMD_BT_ACCESS */
 enum cmd_bt_access_opts {
         /* The bt commands start at 5 instead of 1 because the old dft commands
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index b1e24723f2f9..3e8d555ba3a9 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -734,6 +734,13 @@ static int lbs_set_power(struct net_device *dev, struct iw_request_info *info,
 
         lbs_deb_enter(LBS_DEB_WEXT);
 
+        if (!priv->ps_supported) {
+                if (vwrq->disabled)
+                        return 0;
+                else
+                        return -EINVAL;
+        }
+
         /* PS is currently supported only in Infrastructure mode
          * Remove this check if it is to be supported in IBSS mode also
          */