From: Amitkumar Karwar <akarwar@marvell.com>
To: <linux-wireless@vger.kernel.org>
Cc: Cathy Luo <cluo@marvell.com>, Avinash Patil <patila@marvell.com>,
Amitkumar Karwar <akarwar@marvell.com>
Subject: [PATCH 1/4] mwifiex: correction in wakeup timer handling
Date: Fri, 30 Jan 2015 00:40:04 -0800 [thread overview]
Message-ID: <1422607207-15229-1-git-send-email-akarwar@marvell.com> (raw)
Wakeup timer is in sync with 'pm_wakeup_fw_try' flag. It
has been started instead of cancelling at one place. This
patch corrects it.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
---
drivers/net/wireless/mwifiex/sta_event.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c
index c03b82c..80ffe741 100644
--- a/drivers/net/wireless/mwifiex/sta_event.c
+++ b/drivers/net/wireless/mwifiex/sta_event.c
@@ -312,8 +312,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
adapter->ps_state = PS_STATE_AWAKE;
adapter->pm_wakeup_card_req = false;
adapter->pm_wakeup_fw_try = false;
- mod_timer(&adapter->wakeup_timer,
- jiffies + (HZ*3));
+ del_timer_sync(&adapter->wakeup_timer);
break;
}
if (!mwifiex_send_null_packet
--
1.8.1.4
next reply other threads:[~2015-01-30 8:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-30 8:40 Amitkumar Karwar [this message]
2015-01-30 8:40 ` [PATCH 2/4] mwifiex: fix memory leak in mwifiex_send_processed_packet() Amitkumar Karwar
2015-01-30 8:40 ` [PATCH 3/4] mwifiex: fix NULL packet downloading issues Amitkumar Karwar
2015-01-30 8:40 ` [PATCH 4/4] mwifiex: disable UAPSD mode when AP starts Amitkumar Karwar
2015-02-03 13:29 ` [1/4] mwifiex: correction in wakeup timer handling Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422607207-15229-1-git-send-email-akarwar@marvell.com \
--to=akarwar@marvell.com \
--cc=cluo@marvell.com \
--cc=linux-wireless@vger.kernel.org \
--cc=patila@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).