diff options
| author | Petr Štetiar <ynezz@true.cz> | 2020-04-21 11:09:30 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-04-21 22:16:33 +0200 |
| commit | faf668be354af76b8b9f93921b426dc5e9782a98 (patch) | |
| tree | dadddb8dbaa2d6a825cbdfab5cb0015d17c91f91 /target/linux/mediatek/patches-5.4/0401-eth-fix-eth1-tx-timeout.patch | |
| parent | 8d9b36270b1faecdf8c9632e0f18251df9a0990c (diff) | |
| download | upstream-faf668be354af76b8b9f93921b426dc5e9782a98.tar.gz upstream-faf668be354af76b8b9f93921b426dc5e9782a98.tar.bz2 upstream-faf668be354af76b8b9f93921b426dc5e9782a98.zip | |
kernel: bump 5.4 to 5.4.34
Refreshed patches.
Run tested: qemu-x86-64, apalis, a64-olinuxino
Build tested: x86/64, imx6, sunxi/a53
Signed-off-by: Petr Štetiar <ynezz@true.cz>
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 | 6 |
1 files changed, 3 insertions, 3 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 index a0d0591770..271a70df62 100644 --- 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 @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -1090,17 +1090,6 @@ static void mtk_wake_queue(struct mtk_et +@@ -1112,17 +1112,6 @@ static void mtk_wake_queue(struct mtk_et } } @@ -18,7 +18,7 @@ static int mtk_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct mtk_mac *mac = netdev_priv(dev); -@@ -1121,7 +1110,7 @@ static int mtk_start_xmit(struct sk_buff +@@ -1143,7 +1132,7 @@ static int mtk_start_xmit(struct sk_buff tx_num = mtk_cal_txd_req(skb); if (unlikely(atomic_read(&ring->free_count) <= tx_num)) { @@ -27,7 +27,7 @@ netif_err(eth, tx_queued, dev, "Tx Ring full when queue awake!\n"); spin_unlock(ð->page_lock); -@@ -1147,7 +1136,7 @@ static int mtk_start_xmit(struct sk_buff +@@ -1169,7 +1158,7 @@ static int mtk_start_xmit(struct sk_buff goto drop; if (unlikely(atomic_read(&ring->free_count) <= ring->thresh)) |