mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
ath9k: Fix channel context creation
If a new context is being added in addition to the current one, then send the ASSIGN event to abort a running scan since the addition of a context is usually followed by VIF assignment and further operations. Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
86162d497d
commit
4c7e9aee2d
2 changed files with 23 additions and 1 deletions
|
@ -127,6 +127,7 @@ void ath_chanctx_init(struct ath_softc *sc)
|
||||||
void ath_chanctx_set_channel(struct ath_softc *sc, struct ath_chanctx *ctx,
|
void ath_chanctx_set_channel(struct ath_softc *sc, struct ath_chanctx *ctx,
|
||||||
struct cfg80211_chan_def *chandef)
|
struct cfg80211_chan_def *chandef)
|
||||||
{
|
{
|
||||||
|
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
||||||
bool cur_chan;
|
bool cur_chan;
|
||||||
|
|
||||||
spin_lock_bh(&sc->chan_lock);
|
spin_lock_bh(&sc->chan_lock);
|
||||||
|
@ -135,8 +136,11 @@ void ath_chanctx_set_channel(struct ath_softc *sc, struct ath_chanctx *ctx,
|
||||||
cur_chan = sc->cur_chan == ctx;
|
cur_chan = sc->cur_chan == ctx;
|
||||||
spin_unlock_bh(&sc->chan_lock);
|
spin_unlock_bh(&sc->chan_lock);
|
||||||
|
|
||||||
if (!cur_chan)
|
if (!cur_chan) {
|
||||||
|
ath_dbg(common, CHAN_CTX,
|
||||||
|
"Current context differs from the new context\n");
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
ath_set_channel(sc);
|
ath_set_channel(sc);
|
||||||
}
|
}
|
||||||
|
@ -486,6 +490,22 @@ void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif,
|
||||||
ieee80211_queue_work(sc->hw, &sc->chanctx_work);
|
ieee80211_queue_work(sc->hw, &sc->chanctx_work);
|
||||||
break;
|
break;
|
||||||
case ATH_CHANCTX_EVENT_ASSIGN:
|
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;
|
break;
|
||||||
case ATH_CHANCTX_EVENT_CHANGE:
|
case ATH_CHANCTX_EVENT_CHANGE:
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -2236,6 +2236,8 @@ static int ath9k_add_chanctx(struct ieee80211_hw *hw,
|
||||||
conf->def.chan->center_freq);
|
conf->def.chan->center_freq);
|
||||||
|
|
||||||
ath_chanctx_set_channel(sc, ctx, &conf->def);
|
ath_chanctx_set_channel(sc, ctx, &conf->def);
|
||||||
|
ath_chanctx_event(sc, NULL, ATH_CHANCTX_EVENT_ASSIGN);
|
||||||
|
|
||||||
mutex_unlock(&sc->mutex);
|
mutex_unlock(&sc->mutex);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue