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 21/23] ath9k: Fix HW scan abort
Date: Fri, 17 Oct 2014 07:40:28 +0530 [thread overview]
Message-ID: <1413511830-5536-22-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>
Instead of using ATH_CHANCTX_EVENT_ASSIGN to abort
a HW scan when a new interface becomes active, use the
mgd_prepare_tx() callback. This allows us to make
sure that the GO's channel becomes operational by
using flush_work().
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
---
drivers/net/wireless/ath/ath9k/channel.c | 16 ----------------
drivers/net/wireless/ath/ath9k/main.c | 14 +++++++++++++-
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c
index 366a4d9..25b898e 100644
--- a/drivers/net/wireless/ath/ath9k/channel.c
+++ b/drivers/net/wireless/ath/ath9k/channel.c
@@ -743,22 +743,6 @@ void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif,
ieee80211_queue_work(sc->hw, &sc->chanctx_work);
break;
case ATH_CHANCTX_EVENT_ASSIGN:
- /*
- * When adding a new channel context, check if a scan
- * is in progress and abort it since the addition of
- * a new channel context is usually followed by VIF
- * assignment, in which case we have to start multi-channel
- * operation.
- */
- if (test_bit(ATH_OP_SCANNING, &common->op_flags)) {
- ath_dbg(common, CHAN_CTX,
- "Aborting HW scan to add new context\n");
-
- spin_unlock_bh(&sc->chan_lock);
- del_timer_sync(&sc->offchannel.timer);
- ath_scan_complete(sc, true);
- spin_lock_bh(&sc->chan_lock);
- }
break;
case ATH_CHANCTX_EVENT_CHANGE:
break;
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index f58781a..a524eeb 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -2365,7 +2365,6 @@ static int ath9k_add_chanctx(struct ieee80211_hw *hw,
conf->def.chan->center_freq);
ath_chanctx_set_channel(sc, ctx, &conf->def);
- ath_chanctx_event(sc, NULL, ATH_CHANCTX_EVENT_ASSIGN);
mutex_unlock(&sc->mutex);
return 0;
@@ -2496,6 +2495,19 @@ static void ath9k_mgd_prepare_tx(struct ieee80211_hw *hw,
if (!changed)
goto out;
+ if (test_bit(ATH_OP_SCANNING, &common->op_flags)) {
+ ath_dbg(common, CHAN_CTX,
+ "%s: Aborting HW scan\n", __func__);
+
+ mutex_unlock(&sc->mutex);
+
+ del_timer_sync(&sc->offchannel.timer);
+ ath_scan_complete(sc, true);
+ flush_work(&sc->chanctx_work);
+
+ mutex_lock(&sc->mutex);
+ }
+
go_ctx = ath_is_go_chanctx_present(sc);
if (go_ctx) {
--
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 ` [PATCH v2 19/23] ath9k: Fix RoC expiration Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 20/23] ath9k: Send oneshot NoA Sujith Manoharan
2014-10-17 2:10 ` Sujith Manoharan [this message]
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-22-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