diff options
| author | John Crispin <john@phrozen.org> | 2020-04-03 11:52:35 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2020-04-06 07:07:42 +0200 |
| commit | e2ceb8dd93ace2e82fe136e1900b6830ac11049d (patch) | |
| tree | a708d9409b3c6baad5a62a0f0cc40045cd39d37b /target/linux/mediatek/patches-5.4/0401-eth-fix-eth1-tx-timeout.patch | |
| parent | beb9820ed3647c7bcd6a6082149305abfd53c389 (diff) | |
| download | upstream-e2ceb8dd93ace2e82fe136e1900b6830ac11049d.tar.gz upstream-e2ceb8dd93ace2e82fe136e1900b6830ac11049d.tar.bz2 upstream-e2ceb8dd93ace2e82fe136e1900b6830ac11049d.zip | |
mediatek: more v5.4 fixes
These are all backports and/or on their way upstream.
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/mediatek/patches-5.4/0401-eth-fix-eth1-tx-timeout.patch')
| -rw-r--r-- | target/linux/mediatek/patches-5.4/0401-eth-fix-eth1-tx-timeout.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/target/linux/mediatek/patches-5.4/0401-eth-fix-eth1-tx-timeout.patch b/target/linux/mediatek/patches-5.4/0401-eth-fix-eth1-tx-timeout.patch new file mode 100644 index 0000000000..c882cbbfe3 --- /dev/null +++ b/target/linux/mediatek/patches-5.4/0401-eth-fix-eth1-tx-timeout.patch @@ -0,0 +1,39 @@ +diff -urN b/drivers/net/ethernet/mediatek/mtk_eth_soc.c c/drivers/net/ethernet/mediatek/mtk_eth_soc.c +--- b/drivers/net/ethernet/mediatek/mtk_eth_soc.c 2020-03-31 16:05:39.142008780 +0800 ++++ c/drivers/net/ethernet/mediatek/mtk_eth_soc.c 2020-03-31 16:08:12.422190657 +0800 +@@ -1090,17 +1090,6 @@ + } + } + +-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 int mtk_start_xmit(struct sk_buff *skb, struct net_device *dev) + { + struct mtk_mac *mac = netdev_priv(dev); +@@ -1121,7 +1110,7 @@ + + 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); +@@ -1147,7 +1136,7 @@ + goto drop; + + if (unlikely(atomic_read(&ring->free_count) <= ring->thresh)) +- mtk_stop_queue(eth); ++ netif_stop_queue(dev); + + spin_unlock(ð->page_lock); + |