[PATCH net-next 2/3] net: hns3: Use netif_xmit_timeout_ms() helper

Tariq Toukan posted 3 patches 6 days, 16 hours ago
[PATCH net-next 2/3] net: hns3: Use netif_xmit_timeout_ms() helper
Posted by Tariq Toukan 6 days, 16 hours ago
From: Shahar Shitrit <shshitrit@nvidia.com>

Replace the open-coded TX queue timeout check in
hns3_get_timeout_queue() with a call to netif_xmit_timeout_ms() helper.

Signed-off-by: Shahar Shitrit <shshitrit@nvidia.com>
Reviewed-by: Yael Chemla <ychemla@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
---
 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 7a0654e2d3dd..3e8fe3b5d32b 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -2811,10 +2811,7 @@ static int hns3_get_timeout_queue(struct net_device *ndev)
 		unsigned long trans_start;
 
 		q = netdev_get_tx_queue(ndev, i);
-		trans_start = READ_ONCE(q->trans_start);
-		if (netif_xmit_stopped(q) &&
-		    time_after(jiffies,
-			       (trans_start + ndev->watchdog_timeo))) {
+		if (netif_xmit_timeout_ms(q, &trans_start)) {
 #ifdef CONFIG_BQL
 			struct dql *dql = &q->dql;
 
-- 
2.31.1