| Message ID | 934b51921e22ca6f8983d7cbd9feb5248f804303.1637590567.git.deren.wu@mediatek.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | mt76: mt7921: fix timestamp check in tx_status | expand |
On 2021-11-22 15:25, Deren Wu wrote: > From: Deren Wu <deren.wu@mediatek.com> > > Should keep SKBs only if timeout timestamp is still after jiffies. > Otherwise, report tx status and drop it direclty. > > Fixes: bd1e3e7b693c ("mt76: introduce packet_id idr") > Signed-off-by: Deren Wu <deren.wu@mediatek.com> Please drop the "mt7921: " from the subject, since it affects all drivers. Other than that, the patch looks good. Thanks! - Felix
> From: Deren Wu <deren.wu@mediatek.com> > > Should keep SKBs only if timeout timestamp is still after jiffies. > Otherwise, report tx status and drop it direclty. > > Fixes: bd1e3e7b693c ("mt76: introduce packet_id idr") > Signed-off-by: Deren Wu <deren.wu@mediatek.com> > --- I guess this fix should go in wireless-drivers tree. Acked-by: Lorenzo Bianconi <lorenzo@kernel.org> > drivers/net/wireless/mediatek/mt76/tx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c > index 11719ef034d8..6b8c9dc80542 100644 > --- a/drivers/net/wireless/mediatek/mt76/tx.c > +++ b/drivers/net/wireless/mediatek/mt76/tx.c > @@ -173,7 +173,7 @@ mt76_tx_status_skb_get(struct mt76_dev *dev, struct mt76_wcid *wcid, int pktid, > if (!(cb->flags & MT_TX_CB_DMA_DONE)) > continue; > > - if (!time_is_after_jiffies(cb->jiffies + > + if (time_is_after_jiffies(cb->jiffies + > MT_TX_STATUS_SKB_TIMEOUT)) > continue; > } > -- > 2.18.0 >
diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c index 11719ef034d8..6b8c9dc80542 100644 --- a/drivers/net/wireless/mediatek/mt76/tx.c +++ b/drivers/net/wireless/mediatek/mt76/tx.c @@ -173,7 +173,7 @@ mt76_tx_status_skb_get(struct mt76_dev *dev, struct mt76_wcid *wcid, int pktid, if (!(cb->flags & MT_TX_CB_DMA_DONE)) continue; - if (!time_is_after_jiffies(cb->jiffies + + if (time_is_after_jiffies(cb->jiffies + MT_TX_STATUS_SKB_TIMEOUT)) continue; }