openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath9k: Implement mgd_prepare_tx 

Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Felix Fietkau 2014-06-11 16:18:09 +05:30 committed by John W. Linville
parent 58b5737528
commit 6036c28456
3 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/ath/ath9k/ath9k.h
View File

@ -357,6 +357,7 @@ enum ath_chanctx_state {
ATH_CHANCTX_STATE_WAIT_FOR_BEACON,
ATH_CHANCTX_STATE_WAIT_FOR_TIMER,
ATH_CHANCTX_STATE_SWITCH,
ATH_CHANCTX_STATE_FORCE_ACTIVE,
};
struct ath_chanctx_sched {
@ -397,6 +398,8 @@ struct ath_offchannel {
ctx++)
void ath9k_fill_chanctx_ops(void);
void ath9k_chanctx_force_active(struct ieee80211_hw *hw,
struct ieee80211_vif *vif);
static inline struct ath_chanctx *
ath_chanctx_get(struct ieee80211_chanctx_conf *ctx)
{

50
drivers/net/wireless/ath/ath9k/channel.c
View File

@ -223,25 +223,20 @@ static bool ath_chanctx_defer_switch(struct ath_softc *sc)
return true;
}
void ath_chanctx_work(struct work_struct *work)
static void ath_chanctx_set_next(struct ath_softc *sc, bool force)
{
struct ath_softc *sc = container_of(work, struct ath_softc,
chanctx_work);
struct timespec ts;
bool measure_time = false;
bool send_ps = false;
mutex_lock(&sc->mutex);
spin_lock_bh(&sc->chan_lock);
if (!sc->next_chan) {
spin_unlock_bh(&sc->chan_lock);
mutex_unlock(&sc->mutex);
return;
}
if (ath_chanctx_defer_switch(sc)) {
if (!force && ath_chanctx_defer_switch(sc)) {
spin_unlock_bh(&sc->chan_lock);
mutex_unlock(&sc->mutex);
return;
}
@ -269,8 +264,9 @@ void ath_chanctx_work(struct work_struct *work)
sc->cur_chan = sc->next_chan;
sc->cur_chan->stopped = false;
sc->next_chan = NULL;
sc->sched.state = ATH_CHANCTX_STATE_IDLE;
sc->sched.offchannel_duration = 0;
if (sc->sched.state != ATH_CHANCTX_STATE_FORCE_ACTIVE)
sc->sched.state = ATH_CHANCTX_STATE_IDLE;
spin_unlock_bh(&sc->chan_lock);
@ -286,6 +282,14 @@ void ath_chanctx_work(struct work_struct *work)
ath_chanctx_send_ps_frame(sc, false);
ath_offchannel_channel_change(sc);
}
void ath_chanctx_work(struct work_struct *work)
{
struct ath_softc *sc = container_of(work, struct ath_softc,
chanctx_work);
mutex_lock(&sc->mutex);
ath_chanctx_set_next(sc, false);
mutex_unlock(&sc->mutex);
}
@ -320,6 +324,36 @@ void ath_chanctx_init(struct ath_softc *sc)
}
void ath9k_chanctx_force_active(struct ieee80211_hw *hw,
struct ieee80211_vif *vif)
{
struct ath_softc *sc = hw->priv;
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
struct ath_vif *avp = (struct ath_vif *) vif->drv_priv;
bool changed = false;
if (!test_bit(ATH_OP_MULTI_CHANNEL, &common->op_flags))
return;
if (!avp->chanctx)
return;
mutex_lock(&sc->mutex);
spin_lock_bh(&sc->chan_lock);
if (sc->next_chan || (sc->cur_chan != avp->chanctx)) {
sc->next_chan = avp->chanctx;
changed = true;
}
sc->sched.state = ATH_CHANCTX_STATE_FORCE_ACTIVE;
spin_unlock_bh(&sc->chan_lock);
if (changed)
ath_chanctx_set_next(sc, true);
mutex_unlock(&sc->mutex);
}
void ath_chanctx_switch(struct ath_softc *sc, struct ath_chanctx *ctx,
struct cfg80211_chan_def *chandef)
{

1
drivers/net/wireless/ath/ath9k/main.c
View File

@ -2553,6 +2553,7 @@ void ath9k_fill_chanctx_ops(void)
ath9k_ops.change_chanctx = ath9k_change_chanctx;
ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
ath9k_ops.mgd_prepare_tx = ath9k_chanctx_force_active;
}
struct ieee80211_ops ath9k_ops = {