mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
3ca9849589
Manually rebased: backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch Removed upstreamed: bcm47xx/patches-5.10/170-bgmac-fix-initial-chip-reset-to-support-BCM5358.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.175&id=cbf11ff3708ff163387da924f80a47ce7c721e9b Signed-off-by: John Audia <therealgraysky@proton.me>
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
From 16ef670789b252b221700adc413497ed2f941d8a Mon Sep 17 00:00:00 2001
|
|
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Thu, 22 Apr 2021 22:20:59 -0700
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: remove unnecessary TX queue stops
|
|
|
|
When running short on descriptors, only stop the queue for the netdev that
|
|
tx was attempted for. By the time something tries to send on the other
|
|
netdev, the ring might have some more room already.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 15 ++-------------
|
|
1 file changed, 2 insertions(+), 13 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -1164,17 +1164,6 @@ static void mtk_wake_queue(struct mtk_et
|
|
}
|
|
}
|
|
|
|
-static void mtk_stop_queue(struct mtk_eth *eth)
|
|
-{
|
|
- int i;
|
|
-
|
|
- for (i = 0; i < MTK_MAC_COUNT; i++) {
|
|
- if (!eth->netdev[i])
|
|
- continue;
|
|
- netif_stop_queue(eth->netdev[i]);
|
|
- }
|
|
-}
|
|
-
|
|
static netdev_tx_t mtk_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
{
|
|
struct mtk_mac *mac = netdev_priv(dev);
|
|
@@ -1195,7 +1184,7 @@ static netdev_tx_t mtk_start_xmit(struct
|
|
|
|
tx_num = mtk_cal_txd_req(skb);
|
|
if (unlikely(atomic_read(&ring->free_count) <= tx_num)) {
|
|
- mtk_stop_queue(eth);
|
|
+ netif_stop_queue(dev);
|
|
netif_err(eth, tx_queued, dev,
|
|
"Tx Ring full when queue awake!\n");
|
|
spin_unlock(ð->page_lock);
|
|
@@ -1221,7 +1210,7 @@ static netdev_tx_t mtk_start_xmit(struct
|
|
goto drop;
|
|
|
|
if (unlikely(atomic_read(&ring->free_count) <= ring->thresh))
|
|
- mtk_stop_queue(eth);
|
|
+ netif_stop_queue(dev);
|
|
|
|
spin_unlock(ð->page_lock);
|
|
|