gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 05:16:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

mt76: mt76x02: fix tx reordering on rate control probing without a-mpdu

Browse Source 
To avoid aggregating rate control probing packets with other traffic, and to
ensure that the probing rate gets used, probing packets get assigned a different
internal queueing priority.
This causes packets to be transmitted in a different order, which is compensated
by the receiver side reordering.
However, if A-MPDU is disabled, this reordering can become visible to upper
layers on the receiver side. Disable the priority change if A-MPDU is disabled.

Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Felix Fietkau
2019-06-06 09:30:26 +02:00
parent 76a234fe19
commit 053e76cc46
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mt76x02_txrx.c
+2 -1
View File
@@ -153,6 +153,7 @@ int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
{
struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);
struct mt76x02_txwi *txwi = txwi_ptr;
bool ampdu = IEEE80211_SKB_CB(skb)->flags & IEEE80211_TX_CTL_AMPDU;
int qsel = MT_QSEL_EDCA;
int pid;
int ret;
@@ -174,7 +175,7 @@ int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
if (ret < 0)
return ret;
if (mt76_is_skb_pktid(pid))
if (mt76_is_skb_pktid(pid) && ampdu)
qsel = MT_QSEL_MGMT;
*tx_info = FIELD_PREP(MT_TXD_INFO_QSEL, qsel) |
mt76x02_usb_core.c
+3 -1
View File
@@ -77,6 +77,7 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,
u32 *tx_info)
{
struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);
bool ampdu = IEEE80211_SKB_CB(skb)->flags & IEEE80211_TX_CTL_AMPDU;
struct mt76x02_txwi *txwi;
enum mt76_qsel qsel;
int len = skb->len;
@@ -97,7 +98,8 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,
txwi->pktid = pid;
if (mt76_is_skb_pktid(pid) || q2ep(q->hw_idx) == MT_EP_OUT_HCCA)
if ((mt76_is_skb_pktid(pid) && ampdu) ||
q2ep(q->hw_idx) == MT_EP_OUT_HCCA)
qsel = MT_QSEL_MGMT;
else
qsel = MT_QSEL_EDCA;