Skip to content

Commit

Permalink
libertas: handle HOST_AWAKE event by sending WAKEUP_CONFIRM command
Browse files Browse the repository at this point in the history
lbs_send_confirmwake() is a bit ugly but matches the way we confirm
sleep. We'll deal with that whole thing later.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
David Woodhouse authored and David S. Miller committed Jan 28, 2008
1 parent 24dba5f commit b47ef24
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 1 deletion.
30 changes: 29 additions & 1 deletion drivers/net/wireless/libertas/cmdresp.c
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,30 @@ int lbs_process_rx_command(struct lbs_private *priv)
return ret;
}

static int lbs_send_confirmwake(struct lbs_private *priv)
{
struct cmd_header *cmd = &priv->lbs_ps_confirm_wake;
int ret = 0;

lbs_deb_enter(LBS_DEB_HOST);

cmd->command = cpu_to_le16(CMD_802_11_WAKEUP_CONFIRM);
cmd->size = cpu_to_le16(sizeof(*cmd));
cmd->seqnum = cpu_to_le16(++priv->seqnum);
cmd->result = 0;

lbs_deb_host("SEND_WAKEC_CMD: before download\n");

lbs_deb_hex(LBS_DEB_HOST, "wake confirm command", (void *)cmd, sizeof(*cmd));

ret = priv->hw_host_to_card(priv, MVMS_CMD, (void *)cmd, sizeof(*cmd));
if (ret)
lbs_pr_alert("SEND_WAKEC_CMD: Host to Card failed for Confirm Wake\n");

lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret);
return ret;
}

int lbs_process_event(struct lbs_private *priv)
{
int ret = 0;
Expand Down Expand Up @@ -821,9 +845,13 @@ int lbs_process_event(struct lbs_private *priv)

break;

case MACREG_INT_CODE_HOST_AWAKE:
lbs_deb_cmd("EVENT: HOST_AWAKE\n");
lbs_send_confirmwake(priv);
break;

case MACREG_INT_CODE_PS_AWAKE:
lbs_deb_cmd("EVENT: awake\n");

/* handle unexpected PS AWAKE event */
if (priv->psstate == PS_STATE_FULL_POWER) {
lbs_deb_cmd(
Expand Down
1 change: 1 addition & 0 deletions drivers/net/wireless/libertas/dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ struct lbs_private {
u8 needtowakeup;

struct PS_CMD_ConfirmSleep lbs_ps_confirm_sleep;
struct cmd_header lbs_ps_confirm_wake;

struct assoc_request * pending_assoc_req;
struct assoc_request * in_progress_assoc_req;
Expand Down
1 change: 1 addition & 0 deletions drivers/net/wireless/libertas/host.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
#define CMD_802_11_GET_AFC 0x003d
#define CMD_802_11_AD_HOC_STOP 0x0040
#define CMD_802_11_HOST_SLEEP_CFG 0x0043
#define CMD_802_11_WAKEUP_CONFIRM 0x0044
#define CMD_802_11_HOST_SLEEP_ACTIVATE 0x0045
#define CMD_802_11_BEACON_STOP 0x0049
#define CMD_802_11_MAC_ADDRESS 0x004d
Expand Down

0 comments on commit b47ef24

Please sign in to comment.