Skip to content

Commit

Permalink
mt76: fix tx status timeout processing
Browse files Browse the repository at this point in the history
Remove bogus check for MT_PACKET_ID_NO_ACK in mt76_tx_status_skb_get, which
is already handled in callers and turns timeout calls into no-ops
Do not clean up pending status items on reordering of tx status information
if the timeout is not reached yet

Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
nbd168 committed Jan 25, 2019
1 parent aa470d8 commit b4ee01f
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions tx.c
Expand Up @@ -205,9 +205,6 @@ mt76_tx_status_skb_get(struct mt76_dev *dev, struct mt76_wcid *wcid, int pktid,
{
struct sk_buff *skb, *tmp;

if (pktid == MT_PACKET_ID_NO_ACK)
return NULL;

skb_queue_walk_safe(&dev->status_list, skb, tmp) {
struct mt76_tx_cb *cb = mt76_tx_skb_cb(skb);

Expand All @@ -217,7 +214,7 @@ mt76_tx_status_skb_get(struct mt76_dev *dev, struct mt76_wcid *wcid, int pktid,
if (cb->pktid == pktid)
return skb;

if (!pktid &&
if (pktid >= 0 &&
!time_after(jiffies, cb->jiffies + MT_TX_STATUS_SKB_TIMEOUT))
continue;

Expand Down

0 comments on commit b4ee01f

Please sign in to comment.