ath9k patches
cover ath9k patches
From: Sujith Manoharan <[email protected]>
A few more MCC fixes for 3.18.
Sujith Manoharan (3):
ath9k: Use a subroutine to assign HW queues
ath9k: Fix offchannel operation
ath9k: Fix MCC scanning
drivers/net/wireless/ath/ath9k/ath9k.h | 1 + drivers/net/wireless/ath/ath9k/channel.c | 8 +++++++- drivers/net/wireless/ath/ath9k/init.c | 2 +- drivers/net/wireless/ath/ath9k/main.c | 33 ++++++++++++++++---------------- 4 files changed, 26 insertions(+), 18 deletions(-)
Signature · 1 line
2.1.0
PATCH 1/3 ath9k: Use a subroutine to assign HW queues
From: Sujith Manoharan <[email protected]>
Reduces code duplication.
--- drivers/net/wireless/ath/ath9k/init.c | 2 +- drivers/net/wireless/ath/ath9k/main.c | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-)
drivers/net/wireless/ath/ath9k/init.c +1 -1
@@ -811,7 +811,7 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)/* allow 4 queues per channel context + * 1 cab queue + 1 offchannel tx queue */ - hw->queues =10 ; + hw->queues =ATH9K_NUM_TX_QUEUES ;/* last queue for offchannel */ hw->offchannel_tx_hw_queue = hw->queues -1 ; hw->max_rates =4 ;
drivers/net/wireless/ath/ath9k/main.c +17 -16
@@ -1104,6 +1104,20 @@ void ath9k_calculate_summary_state(struct ath_softc *sc,ath9k_ps_restore (sc); } +static void ath9k_assign_hw_queues (struct ieee80211_hw *hw, +struct ieee80211_vif *vif) +{ +int i; + +for (i =0 ; i <IEEE80211_NUM_ACS ; i++) + vif->hw_queue[i] = i; + +if (vif->type ==NL80211_IFTYPE_AP ) + vif->cab_queue = hw->queues -2 ; +else + vif->cab_queue =IEEE80211_INVAL_HW_QUEUE ; +} +static int ath9k_add_interface (struct ieee80211_hw *hw,struct ieee80211_vif *vif) {
@@ -1112,7 +1126,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,struct ath_common *common =ath9k_hw_common (ah);struct ath_vif *avp = (void *)vif->drv_priv;struct ath_node *an = &avp->mcast_node; -int i;mutex_lock (&sc->mutex);
@@ -1135,12 +1148,8 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, avp->chanctx = sc->cur_chan;list_add_tail (&avp->list, &avp->chanctx->vifs); } -for (i =0 ; i <IEEE80211_NUM_ACS ; i++) - vif->hw_queue[i] = i; -if (vif->type ==NL80211_IFTYPE_AP ) - vif->cab_queue = hw->queues -2 ; -else - vif->cab_queue =IEEE80211_INVAL_HW_QUEUE ; + +ath9k_assign_hw_queues (hw, vif); an->sc = sc; an->sta =NULL ;
@@ -1160,7 +1169,6 @@ static int ath9k_change_interface(struct ieee80211_hw *hw,struct ath_softc *sc = hw->priv;struct ath_common *common =ath9k_hw_common (sc->sc_ah);struct ath_vif *avp = (void *)vif->drv_priv; -int i;mutex_lock (&sc->mutex);
@@ -1180,14 +1188,7 @@ static int ath9k_change_interface(struct ieee80211_hw *hw,if (ath9k_uses_beacons (vif->type))ath9k_beacon_assign_slot (sc, vif); -for (i =0 ; i <IEEE80211_NUM_ACS ; i++) - vif->hw_queue[i] = i; - -if (vif->type ==NL80211_IFTYPE_AP ) - vif->cab_queue = hw->queues -2 ; -else - vif->cab_queue =IEEE80211_INVAL_HW_QUEUE ; - +ath9k_assign_hw_queues (hw, vif);ath9k_calculate_summary_state (sc, avp->chanctx);mutex_unlock (&sc->mutex);
Signature · 1 line
2.1.0
PATCH 2/3 ath9k: Fix offchannel operation
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
When multiple channel contexts are active, an offchannel request will not be handled immediately, but will be queued to be handled later. But, currently, the channel definition is not copied to the local offchannel state. This breaks operation like scanning when MCC is active.
Fix this by storing the offchannel parameters properly.
--- drivers/net/wireless/ath/ath9k/channel.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/ath/ath9k/channel.c +4 -0
@@ -588,7 +588,11 @@ static void ath_chanctx_switch(struct ath_softc *sc, struct ath_chanctx *ctx,if (test_bit (ATH_OP_MULTI_CHANNEL , &common->op_flags) && (sc->cur_chan != ctx) && (ctx == &sc->offchannel.chan)) { sc->sched.offchannel_pending = true; +if (chandef) + ctx->chandef = *chandef;spin_unlock_bh (&sc->chan_lock); +ath_dbg (common,CHAN_CTX , +"Set offchannel_pending to true\n" );return ; }
Signature · 1 line
2.1.0
PATCH 3/3 ath9k: Fix MCC scanning
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
Scanning is curently broken when two channel contexts are active. For example in a P2P-GO/STA setup, the offchannel timer allows HZ / 10 to elapse before initiating a switch to the next scan channel from the current operating channel, which in this case would be the P2P-GO context.
But, the channel context timer might decide to switch to the STA context when an SWBA comes early and a beacon is sent out. Since pending offchannel requests are processed in EVENT_BEACON_PREPARE, this causes inconsistent scanning.
Fix this by making sure that a context switch happens before processing the pending offchannel request. This also makes sure that active channel contexts will always have higher priority than offchannel operations and the scan sequence looks like this:
p2p-go, sta, p2p-go, offchannel, p2p-go, sta, p2p-go, offchannel,.....
The oper-channel is p2p-go, so the STA context has to switch to p2p-go again before switching offchannel.
--- drivers/net/wireless/ath/ath9k/ath9k.h | 1 + drivers/net/wireless/ath/ath9k/channel.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/ath9k.h +1 -0
@@ -378,6 +378,7 @@ enum ath_chanctx_state {struct ath_chanctx_sched {bool beacon_pending;bool offchannel_pending; +bool wait_switch;enum ath_chanctx_state state;u8 beacon_miss;
drivers/net/wireless/ath/ath9k/channel.c +3 -1
@@ -333,7 +333,7 @@ void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif,break ; } -if (sc->sched.offchannel_pending) { +if (sc->sched.offchannel_pending && !sc->sched.wait_switch) { sc->sched.offchannel_pending = false; sc->next_chan = &sc->offchannel.chan; sc->sched.state =ATH_CHANCTX_STATE_WAIT_FOR_BEACON ;
@@ -490,6 +490,7 @@ void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif, "Move chanctx state to WAIT_FOR_TIMER (event SWITCH)\n"); sc->sched.state =ATH_CHANCTX_STATE_WAIT_FOR_TIMER ; + sc->sched.wait_switch = false; tsf_time =TU_TO_USEC (cur_conf->beacon_interval) /2 ;if (sc->sched.beacon_miss >=2 ) {
@@ -588,6 +589,7 @@ static void ath_chanctx_switch(struct ath_softc *sc, struct ath_chanctx *ctx,if (test_bit (ATH_OP_MULTI_CHANNEL , &common->op_flags) && (sc->cur_chan != ctx) && (ctx == &sc->offchannel.chan)) { sc->sched.offchannel_pending = true; + sc->sched.wait_switch = true;if (chandef) ctx->chandef = *chandef;spin_unlock_bh (&sc->chan_lock);
Signature · 1 line
2.1.0