mt76: fix handling ps-poll frames
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/2 mt76: fix handling ps-poll frames
Hardware station lookup for pspoll frames can fail, which makes the driver ignore ps-poll frames. Fix the resulting powersave issues by looking up the station for pspoll frames in software
Signed-off-by Felix Fietkau <[email protected]>
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/mediatek/mt76/mac80211.c +6 -0
@@ -550,6 +550,12 @@ mt76_check_ps(struct mt76_dev *dev, struct sk_buff *skb)struct mt76_wcid *wcid = status->wcid;bool ps; +if (ieee80211_is_pspoll (hdr->frame_control) && !wcid) { + sta =ieee80211_find_sta_by_ifaddr (dev->hw, hdr->addr2,NULL ); +if (sta) + wcid = status->wcid = (struct mt76_wcid *) sta->drv_priv; + } +if (!wcid || !wcid->sta)return ;
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 2/2 mt76: check aggregation sequence number for frames sent via drv_tx
ps-poll response frames can be sent via drv_tx. Store the frame sequence number for such frames, in case a BlockAckReq needs to be sent
Signed-off-by Felix Fietkau <[email protected]>
--- drivers/net/wireless/mediatek/mt76/tx.c | 36 +++++++++++++++++-------- 1 file changed, 25 insertions(+), 11 deletions(-)
drivers/net/wireless/mediatek/mt76/tx.c +25 -11
@@ -91,11 +91,23 @@ mt76_txq_get_qid(struct ieee80211_txq *txq)return txq->ac; } +static void +mt76_check_agg_ssn (struct mt76_txq *mtxq,struct sk_buff *skb) +{ +struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; + +if (!ieee80211_is_data_qos (hdr->frame_control)) +return ; + + mtxq->agg_ssn =le16_to_cpu (hdr->seq_ctrl) +0x10 ; +} +void mt76_tx (struct mt76_dev *dev,struct ieee80211_sta *sta,struct mt76_wcid *wcid,struct sk_buff *skb) {struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); +struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;struct mt76_queue *q;int qid =skb_get_queue_mapping (skb);
@@ -108,6 +120,19 @@ mt76_tx(struct mt76_dev *dev, struct ieee80211_sta *sta,ieee80211_get_tx_rates (info->control.vif, sta, skb, info->control.rates,1 ); +if (sta &&ieee80211_is_data_qos (hdr->frame_control)) { +struct ieee80211_txq *txq; +struct mt76_txq *mtxq; +u8 tid; + + tid = skb->priority &IEEE80211_QOS_CTL_TID_MASK ; + txq = sta->txq[tid]; + mtxq = (struct mt76_txq *) txq->drv_priv; + +if (mtxq->aggr) +mt76_check_agg_ssn (mtxq, skb); + } + q = &dev->q_tx[qid];spin_lock_bh (&q->lock);
@@ -143,17 +168,6 @@ mt76_txq_dequeue(struct mt76_dev *dev, struct mt76_txq *mtxq, bool ps)return skb; } -static void -mt76_check_agg_ssn (struct mt76_txq *mtxq,struct sk_buff *skb) -{ -struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; - -if (!ieee80211_is_data_qos (hdr->frame_control)) -return ; - - mtxq->agg_ssn =le16_to_cpu (hdr->seq_ctrl) +0x10 ; -} -static void mt76_queue_ps_skb (struct mt76_dev *dev,struct ieee80211_sta *sta,struct sk_buff *skb,bool last)
Signature · 1 line
2.17.0