ath9k patches
cover ath9k patches
From: Sujith Manoharan <[email protected]>
MCC fixes for 3.18. This includes the two patches that were posted earlier.
Sujith Manoharan (5):
ath9k: Cache BSS information
ath9k: Fix p2p address management
ath9k: Fix queue management
ath9k: Use normal queues for offchannel frames
ath9k: Fix offchannel queuing
drivers/net/wireless/ath/ath9k/ath9k.h | 6 ++++ drivers/net/wireless/ath/ath9k/channel.c | 6 ++-- drivers/net/wireless/ath/ath9k/main.c | 49 +++++++++++++++++++++++++++++--- drivers/net/wireless/ath/ath9k/xmit.c | 17 ++++------- 4 files changed, 60 insertions(+), 18 deletions(-)
Signature · 1 line
2.1.0
PATCH 1/5 ath9k: Cache BSS information
From: Sujith Manoharan <[email protected]>
Using the BSS information stored in mac80211 directly is racy in certain conditions. For example, in a MCC setup, if the scheduler is switching channels when a local deauth is issued, calculation of the opmode/bssid etc. is incorrect. To avoid this, store the bss params in the driver and use it.
--- drivers/net/wireless/ath/ath9k/ath9k.h | 5 +++++ drivers/net/wireless/ath/ath9k/channel.c | 6 +++--- drivers/net/wireless/ath/ath9k/main.c | 13 +++++++++---- 3 files changed, 17 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +5 -0
@@ -585,6 +585,11 @@ void ath9k_release_buffered_frames(struct ieee80211_hw *hw,struct ath_vif {struct list_head list; +/* BSS info */ +u8 bssid[ETH_ALEN ]; +u16 aid; +bool assoc; +struct ieee80211_vif *vif;struct ath_node mcast_node;int av_bslot;
drivers/net/wireless/ath/ath9k/channel.c +3 -3
@@ -211,7 +211,7 @@ void ath_chanctx_check_active(struct ath_softc *sc, struct ath_chanctx *ctx)switch (vif->type) {case NL80211_IFTYPE_P2P_CLIENT :case NL80211_IFTYPE_STATION : -if (vif->bss_conf.assoc) +if (avp->assoc) active = true;break ;default :
@@ -917,7 +917,7 @@ ath_chanctx_send_vif_ps_frame(struct ath_softc *sc, struct ath_vif *avp,switch (vif->type) {case NL80211_IFTYPE_STATION : -if (!vif->bss_conf.assoc) +if (!avp->assoc)return false; skb =ieee80211_nullfunc_get (sc->hw, vif);
@@ -1339,7 +1339,7 @@ void ath9k_p2p_ps_timer(void *priv)rcu_read_lock (); vif = avp->vif; - sta =ieee80211_find_sta (vif, vif->bss_conf.bssid); + sta =ieee80211_find_sta (vif, avp->bssid);if (!sta) goto out;
drivers/net/wireless/ath/ath9k/main.c +9 -4
@@ -898,6 +898,7 @@ static bool ath9k_uses_beacons(int type)static void ath9k_vif_iter (struct ath9k_vif_iter_data *iter_data,u8 *mac,struct ieee80211_vif *vif) { +struct ath_vif *avp = (struct ath_vif *)vif->drv_priv;int i;if (iter_data->has_hw_macaddr) {
@@ -918,7 +919,7 @@ static void ath9k_vif_iter(struct ath9k_vif_iter_data *iter_data,break ;case NL80211_IFTYPE_STATION : iter_data->nstations++; -if (vif->bss_conf.assoc && !iter_data->primary_sta) +if (avp->assoc && !iter_data->primary_sta) iter_data->primary_sta = vif;break ;case NL80211_IFTYPE_ADHOC :
@@ -963,13 +964,13 @@ static void ath9k_set_assoc_state(struct ath_softc *sc, struct ieee80211_vif *vif, bool changed) {struct ath_common *common =ath9k_hw_common (sc->sc_ah); -struct ieee80211_bss_conf *bss_conf = &vif->bss_conf; +struct ath_vif *avp = (struct ath_vif *)vif->drv_priv;unsigned long flags;set_bit (ATH_OP_PRIM_STA_VIF , &common->op_flags); -ether_addr_copy (common->curbssid, bss_conf->bssid); - common->curaid = bss_conf->aid; +ether_addr_copy (common->curbssid, avp->bssid); + common->curaid = avp->aid;ath9k_hw_write_associd (sc->sc_ah);if (changed) {
@@ -1698,6 +1699,10 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,ath_dbg (common,CONFIG ,"BSSID %pM Changed ASSOC %d\n" , bss_conf->bssid, bss_conf->assoc); +ether_addr_copy (avp->bssid, bss_conf->bssid); + avp->aid = bss_conf->aid; + avp->assoc = bss_conf->assoc; +ath9k_calculate_summary_state (sc, avp->chanctx);if (ath9k_is_chanctx_enabled ()) {
Signature · 1 line
2.1.0
PATCH 2/5 ath9k: Fix p2p address management
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
When multiple channel contexts are enabled, a p2p interface that is assigned to a context will have an address that is different from the device mac address, which is used by wpa_s as the p2p device ID.
Certain frames like provision requests use the device address and these get dropped since ath9k_calculate_summary_state() iterates over only the active interfaces in a context and the device address is not used.
Fix this by adding the device mac address to the bssid mask.
--- drivers/net/wireless/ath/ath9k/ath9k.h | 1 + drivers/net/wireless/ath/ath9k/main.c | 36 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+)
drivers/net/wireless/ath/ath9k/ath9k.h +1 -0
@@ -354,6 +354,7 @@ struct ath_chanctx {bool switch_after_beacon;short nvifs; +short nvifs_assigned;unsigned int rxfilter; };
drivers/net/wireless/ath/ath9k/main.c +36 -0
@@ -940,6 +940,34 @@ static void ath9k_vif_iter(struct ath9k_vif_iter_data *iter_data, } } +static void ath9k_update_bssid_mask (struct ath_softc *sc, +struct ath_chanctx *ctx, +struct ath9k_vif_iter_data *iter_data) +{ +struct ath_common *common =ath9k_hw_common (sc->sc_ah); +struct ath_vif *avp; +int i; + +if (!ath9k_is_chanctx_enabled ()) +return ; + +list_for_each_entry (avp, &ctx->vifs, list) { +if (ctx->nvifs_assigned !=1 ) +continue ; + +if (!avp->vif->p2p || !iter_data->has_hw_macaddr) +continue ; + +ether_addr_copy (common->curbssid, avp->bssid); + +/* perm_addr will be used as the p2p device address. */ +for (i =0 ; i <ETH_ALEN ; i++) + iter_data->mask[i] &= + ~(iter_data->hw_macaddr[i] ^ + sc->hw->wiphy->perm_addr[i]); + } +} +/* Called with sc->mutex held. */ void ath9k_calculate_iter_data(struct ath_softc *sc, struct ath_chanctx *ctx,
@@ -958,6 +986,8 @@ void ath9k_calculate_iter_data(struct ath_softc *sc,list_for_each_entry (avp, &ctx->vifs, list)ath9k_vif_iter (iter_data, avp->vif->addr, avp->vif); + +ath9k_update_bssid_mask (sc, ctx, iter_data); } static void ath9k_set_assoc_state(struct ath_softc *sc,
@@ -1122,6 +1152,10 @@ void ath9k_calculate_summary_state(struct ath_softc *sc,else clear_bit (ATH_OP_PRIM_STA_VIF , &common->op_flags); +ath_dbg (common,CONFIG , +"macaddr: %pM, bssid: %pM, bssidmask: %pM\n" , + common->macaddr, common->curbssid, common->bssidmask); +ath9k_ps_restore (sc); }
@@ -2356,6 +2390,7 @@ static int ath9k_assign_vif_chanctx(struct ieee80211_hw *hw, conf->def.chan->center_freq); avp->chanctx = ctx; + ctx->nvifs_assigned++;list_add_tail (&avp->list, &ctx->vifs);ath9k_calculate_summary_state (sc, ctx);for (i =0 ; i <IEEE80211_NUM_ACS ; i++)
@@ -2384,6 +2419,7 @@ static void ath9k_unassign_vif_chanctx(struct ieee80211_hw *hw, conf->def.chan->center_freq); avp->chanctx =NULL ; + ctx->nvifs_assigned--;list_del (&avp->list);ath9k_calculate_summary_state (sc, ctx);for (ac =0 ; ac <IEEE80211_NUM_ACS ; ac++)
Signature · 1 line
2.1.0
PATCH 3/5 ath9k: Fix queue management
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
Since we use IEEE80211_HW_QUEUE_CONTROL now, the CAB/Offchannel queues are registered as the last two queues. There is no need to check and reassign the queues in the TX start()/done() routines.
CAB frames will not reach the tx() callback since we set IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING and pull the buffered frames during beacon transmission. We also don't have a special HW queue for handling off-channel frames.
--- drivers/net/wireless/ath/ath9k/xmit.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/ath9k/xmit.c +3 -7
@@ -158,7 +158,6 @@ static void ath_txq_skb_done(struct ath_softc *sc, struct ath_txq *txq, {struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);struct ath_frame_info *fi =get_frame_info (skb); -int hw_queue;int q = fi->txq;if (q <0 )
@@ -168,10 +167,9 @@ static void ath_txq_skb_done(struct ath_softc *sc, struct ath_txq *txq,if (WARN_ON (--txq->pending_frames <0 )) txq->pending_frames =0 ; - hw_queue = (info->hw_queue >= sc->hw->queues -2 ) ? q : info->hw_queue;if (txq->stopped && txq->pending_frames < sc->tx.txq_max_pending[q]) { -ieee80211_wake_queue (sc->hw, hw_queue); +ieee80211_wake_queue (sc->hw, info->hw_queue); txq->stopped = false; } }
@@ -2208,8 +2206,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,struct ath_atx_tid *tid =NULL ;struct ath_buf *bf;bool queue; -int q, hw_queue; -int ret; +int q, ret;if (vif) avp = (void *)vif->drv_priv;
@@ -2228,14 +2225,13 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,*/ q =skb_get_queue_mapping (skb); - hw_queue = (info->hw_queue >= sc->hw->queues -2 ) ? q : info->hw_queue;ath_txq_lock (sc, txq);if (txq == sc->tx.txq_map[q]) { fi->txq = q;if (++txq->pending_frames > sc->tx.txq_max_pending[q] && !txq->stopped) { -ieee80211_stop_queue (sc->hw, hw_queue); +ieee80211_stop_queue (sc->hw, info->hw_queue); txq->stopped = true; } }
Signature · 1 line
2.1.0
PATCH 4/5 ath9k: Use normal queues for offchannel frames
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
There is no reason why frames marked with IEEE80211_TX_CTL_TX_OFFCHAN have to be sent using the UAPSD queue. Since mac80211 makes sure that RoC is done before pushing an offchannel frame to the driver, we can use the normal TX queues for transmission.
--- drivers/net/wireless/ath/ath9k/xmit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/xmit.c +1 -2
@@ -2253,8 +2253,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,if (txctl->an && queue) tid =ath_get_skb_tid (sc, txctl->an, skb); -if (info->flags & (IEEE80211_TX_CTL_PS_RESPONSE | -IEEE80211_TX_CTL_TX_OFFCHAN )) { +if (info->flags &IEEE80211_TX_CTL_PS_RESPONSE ) {ath_txq_unlock (sc, txq); txq = sc->tx.uapsdq;ath_txq_lock (sc, txq);
Signature · 1 line
2.1.0
PATCH 5/5 ath9k: Fix offchannel queuing
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
Clearing IEEE80211_TX_CTL_PS_RESPONSE in a frame that is not in the current context doesn't seem right. Instead make sure that we don't add such frames to the UAPSD queue by using a local variable.
--- drivers/net/wireless/ath/ath9k/xmit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath9k/xmit.c +3 -3
@@ -2205,7 +2205,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,struct ath_txq *txq = txctl->txq;struct ath_atx_tid *tid =NULL ;struct ath_buf *bf; -bool queue; +bool queue, skip_uapsd = false;int q, ret;if (vif)
@@ -2246,14 +2246,14 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, sc->cur_chan->stopped) && !txctl->force_channel) {if (!txctl->an) txctl->an = &avp->mcast_node; - info->flags &= ~IEEE80211_TX_CTL_PS_RESPONSE ; queue = true; + skip_uapsd = true; }if (txctl->an && queue) tid =ath_get_skb_tid (sc, txctl->an, skb); -if (info->flags &IEEE80211_TX_CTL_PS_RESPONSE ) { +if (!skip_uapsd && (info->flags &IEEE80211_TX_CTL_PS_RESPONSE )) {ath_txq_unlock (sc, txq); txq = sc->tx.uapsdq;ath_txq_lock (sc, txq);
Signature · 1 line
2.1.0