2021-11-22 14:26:33

by Deren Wu

[permalink] [raw]
Subject: [PATCH] mt76: mt7921: fix timestamp check in tx_status

From: Deren Wu <[email protected]>

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 <[email protected]>
---
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



2021-11-22 14:33:50

by Felix Fietkau

[permalink] [raw]
Subject: Re: [PATCH] mt76: mt7921: fix timestamp check in tx_status

On 2021-11-22 15:25, Deren Wu wrote:
> From: Deren Wu <[email protected]>
>
> 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 <[email protected]>

Please drop the "mt7921: " from the subject, since it affects all
drivers. Other than that, the patch looks good. Thanks!

- Felix

2021-11-22 15:14:47

by Lorenzo Bianconi

[permalink] [raw]
Subject: Re: [PATCH] mt76: mt7921: fix timestamp check in tx_status

> From: Deren Wu <[email protected]>
>
> 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 <[email protected]>
> ---

I guess this fix should go in wireless-drivers tree.

Acked-by: Lorenzo Bianconi <[email protected]>

> 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
>


Attachments:
(No filename) (1.04 kB)
signature.asc (228.00 B)
Download all attachments