Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 23:25:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

libertas: convert DEEP_SLEEP timer to a direct command

Browse Source 
Other uses were already used direct command paths.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Dan Williams 2010-07-27 13:15:01 -07:00 committed by John W. Linville
parent 0bb6408777
commit 53800f5dbf
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/libertas/cmd.c
View File

@ -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;

16
drivers/net/wireless/libertas/main.c
View File

@ -658,7 +658,6 @@ out:
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)
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 +