From: Sujith Manoharan <sujith@msujith.org>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org, ath9k-devel@qca.qualcomm.com
Subject: [PATCH v2 19/23] ath9k: Fix RoC expiration
Date: Fri, 17 Oct 2014 07:40:26 +0530 [thread overview]
Message-ID: <1413511830-5536-20-git-send-email-sujith@msujith.org> (raw)
In-Reply-To: <1413511830-5536-1-git-send-email-sujith@msujith.org>
From: Sujith Manoharan <c_manoha@qca.qualcomm.com>
mac80211 has to be notified when a RoC period
expires in the driver. In MCC mode, since the
offchannel/RoC timer is set with the requested
duration, ieee80211_remain_on_channel_expired() needs
to be called when the timer expires.
But, currently it is done after we move back to
the operating channel. This is incorrect - fix this
by calling ieee80211_remain_on_channel_expired() when
the RoC timer expires and in ath_roc_complete() when
the RoC request is aborted.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
---
drivers/net/wireless/ath/ath9k/channel.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c
index 7fe35a5..447b397 100644
--- a/drivers/net/wireless/ath/ath9k/channel.c
+++ b/drivers/net/wireless/ath/ath9k/channel.c
@@ -894,7 +894,7 @@ void ath_roc_complete(struct ath_softc *sc, bool abort)
sc->offchannel.roc_vif = NULL;
sc->offchannel.roc_chan = NULL;
- if (!abort)
+ if (abort)
ieee80211_remain_on_channel_expired(sc->hw);
ath_offchannel_next(sc);
ath9k_ps_restore(sc);
@@ -1028,6 +1028,7 @@ static void ath_offchannel_timer(unsigned long data)
case ATH_OFFCHANNEL_ROC_WAIT:
ctx = ath_chanctx_get_oper_chan(sc, false);
sc->offchannel.state = ATH_OFFCHANNEL_ROC_DONE;
+ ieee80211_remain_on_channel_expired(sc->hw);
ath_chanctx_switch(sc, ctx, NULL);
break;
default:
--
2.1.2
next prev parent reply other threads:[~2014-10-17 2:10 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-17 2:10 [PATCH v2 00/23] ath9k patches Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 01/23] ath9k: Use sta_state() callback Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 02/23] ath9k: Enable multi-channel properly Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 03/23] ath9k: Process beacons properly Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 04/23] ath9k: Unify reset API Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 05/23] ath9k: Set ATH_OP_HW_RESET before HW reset Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 06/23] ath9k: Disable beacon tasklet during reset Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 07/23] ath9k: Clear NoA schedule properly Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 08/23] ath9k: Use configurable timeout for flush Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 09/23] ath9k: Fix MCC flush timeout Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 10/23] ath9k: Fix offchannel " Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 11/23] ath9k: Check for pending frames properly Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 12/23] ath9k: Send AUTHORIZED event only for station mode Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 13/23] ath9k: Fix address management Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 14/23] ath9k: Add a function to check for an active GO Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 15/23] ath9k: Check for active GO in mgd_prepare_tx() Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 16/23] ath9k: Use a helper function for offchannel NoA Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 17/23] ath9k: Use a helper function to set NoA Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 18/23] ath9k: Use a helper function for bmiss Sujith Manoharan
2014-10-17 2:10 ` Sujith Manoharan [this message]
2014-10-17 2:10 ` [PATCH v2 20/23] ath9k: Send oneshot NoA Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 21/23] ath9k: Fix HW scan abort Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 22/23] ath9k: Improve flush() in mcc mode Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 23/23] ath9k: Do not start BA when scanning Sujith Manoharan
2014-10-20 9:30 ` Johannes Berg
2014-10-20 9:39 ` Sujith Manoharan
2014-10-20 10:38 ` Johannes Berg
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=1413511830-5536-20-git-send-email-sujith@msujith.org \
--to=sujith@msujith.org \
--cc=ath9k-devel@qca.qualcomm.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.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).