libertas: convert sleep/wake config direct commands

Confirm sleep event: they come very regularly, eventually several times per
second. Therefore we want to send the config command as fast as possible.
The old code pre-set the command in priv->lbs_ps_confirm_sleep. However, the
byte sequence to be sent to the hardware is the same for all interfaces. So
this patch make this an extern structure, initialized at module load time.

Config wake event: normal conversion to a direct command. However, I don't know
how to trigger a "HOST AWAKE" event from the firmware, so this part is
untested.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 10 insertions, 22 deletions

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 6e7bfb36b491..dbaf8b9e47d5 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1802,38 +1802,27 @@ void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str)
         lbs_deb_leave(LBS_DEB_WEXT);
 }
 
-static int sendconfirmsleep(struct lbs_private *priv, u8 *cmdptr, u16 size)
+static void lbs_send_confirmsleep(struct lbs_private *priv)
 {
         unsigned long flags;
-        int ret = 0;
+        int ret;
 
         lbs_deb_enter(LBS_DEB_HOST);
-        lbs_deb_hex(LBS_DEB_HOST, "sleep confirm command", cmdptr, size);
-
-        ret = priv->hw_host_to_card(priv, MVMS_CMD, cmdptr, size);
+        lbs_deb_hex(LBS_DEB_HOST, "sleep confirm", (u8 *) &confirm_sleep,
+                sizeof(confirm_sleep));
 
-        spin_lock_irqsave(&priv->driver_lock, flags);
-        if (priv->intcounter || priv->currenttxskb)
-                lbs_deb_host("SEND_SLEEPC_CMD: intcounter %d, currenttxskb %p\n",
-                       priv->intcounter, priv->currenttxskb);
-        spin_unlock_irqrestore(&priv->driver_lock, flags);
+        ret = priv->hw_host_to_card(priv, MVMS_CMD, (u8 *) &confirm_sleep,
+                sizeof(confirm_sleep));
 
         if (ret) {
-                lbs_pr_alert(
-                       "SEND_SLEEPC_CMD: Host to Card failed for Confirm Sleep\n");
+                lbs_pr_alert("confirm_sleep failed\n");
         } else {
                 spin_lock_irqsave(&priv->driver_lock, flags);
-                if (!priv->intcounter) {
+                if (!priv->intcounter)
                         priv->psstate = PS_STATE_SLEEP;
-                } else {
-                        lbs_deb_host("SEND_SLEEPC_CMD: after sent, intcounter %d\n",
-                               priv->intcounter);
-                }
                 spin_unlock_irqrestore(&priv->driver_lock, flags);
         }
-
-        lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret);
-        return ret;
+        lbs_deb_leave(LBS_DEB_HOST);
 }
 
 void lbs_ps_sleep(struct lbs_private *priv, int wait_option)
@@ -1906,8 +1895,7 @@ void lbs_ps_confirm_sleep(struct lbs_private *priv)
 
         if (allowed) {
                 lbs_deb_host("sending lbs_ps_confirm_sleep\n");
-                sendconfirmsleep(priv, (u8 *) & priv->lbs_ps_confirm_sleep,
-                                 sizeof(struct PS_CMD_ConfirmSleep));
+                lbs_send_confirmsleep(priv);
         } else {
                 lbs_deb_host("sleep confirm has been delayed\n");
         }