Commit 53800f5d authored by Dan Williams's avatar Dan Williams Committed by John W. Linville

libertas: convert DEEP_SLEEP timer to a direct command

Other uses were already used direct command paths.
Signed-off-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0bb64087
...@@ -1208,10 +1208,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv, ...@@ -1208,10 +1208,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
cmdptr->result = 0; cmdptr->result = 0;
switch (cmd_no) { switch (cmd_no) {
case CMD_802_11_DEEP_SLEEP:
cmdptr->command = cpu_to_le16(CMD_802_11_DEEP_SLEEP);
cmdptr->size = cpu_to_le16(sizeof(struct cmd_header));
break;
default: default:
lbs_pr_err("PREP_CMD: unknown command 0x%04x\n", cmd_no); lbs_pr_err("PREP_CMD: unknown command 0x%04x\n", cmd_no);
ret = -1; ret = -1;
......
...@@ -658,7 +658,6 @@ static void lbs_cmd_timeout_handler(unsigned long data) ...@@ -658,7 +658,6 @@ static void lbs_cmd_timeout_handler(unsigned long data)
static void auto_deepsleep_timer_fn(unsigned long data) static void auto_deepsleep_timer_fn(unsigned long data)
{ {
struct lbs_private *priv = (struct lbs_private *)data; struct lbs_private *priv = (struct lbs_private *)data;
int ret;
lbs_deb_enter(LBS_DEB_CMD); lbs_deb_enter(LBS_DEB_CMD);
...@@ -666,14 +665,15 @@ static void auto_deepsleep_timer_fn(unsigned long data) ...@@ -666,14 +665,15 @@ static void auto_deepsleep_timer_fn(unsigned long data)
priv->is_activity_detected = 0; priv->is_activity_detected = 0;
} else { } else {
if (priv->is_auto_deep_sleep_enabled && if (priv->is_auto_deep_sleep_enabled &&
(!priv->wakeup_dev_required) && (!priv->wakeup_dev_required) &&
(priv->connect_status != LBS_CONNECTED)) { (priv->connect_status != LBS_CONNECTED)) {
struct cmd_header cmd;
lbs_deb_main("Entering auto deep sleep mode...\n"); lbs_deb_main("Entering auto deep sleep mode...\n");
ret = lbs_prepare_and_send_command(priv, memset(&cmd, 0, sizeof(cmd));
CMD_802_11_DEEP_SLEEP, 0, cmd.size = cpu_to_le16(sizeof(cmd));
0, 0, NULL); lbs_cmd_async(priv, CMD_802_11_DEEP_SLEEP, &cmd,
if (ret) sizeof(cmd));
lbs_pr_err("Enter Deep Sleep command failed\n");
} }
} }
mod_timer(&priv->auto_deepsleep_timer , jiffies + mod_timer(&priv->auto_deepsleep_timer , jiffies +
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment