| commit | 38eeea5221914f538486379cb09b5fe6d6811d08 | [log] [tgz] |
|---|---|---|
| author | developer <developer@mediatek.com> | Fri Feb 02 19:24:28 2024 +0800 |
| committer | developer <developer@mediatek.com> | Fri Feb 02 19:31:30 2024 +0800 |
| tree | a92fc30570e1c4b6dcbeba037199fa2b8f7b4d52 | |
| parent | a7fbeecdd0a34a004ef3e8f7c0e77a94e5147a86 [diff] |
[][kernel][mt7988][eth][Fix patch conflict issue] [Description] Fix patch conflict issue. Re-patch to avoid patch conflicts. [Release-log] N/A Change-Id: Ib958a41f00fa58dd7356d5a5dd5247475fdd334a Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/8640201
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211/target/linux/mediatek/patches-5.4/999-2952-net-ethernet-mtk_eth_soc-modify-fq-size-4K.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211/target/linux/mediatek/patches-5.4/999-2952-net-ethernet-mtk_eth_soc-modify-fq-size-4K.patch index 2d4bfaa..86d3edb 100644 --- a/autobuild_mac80211_release/mt7988_mt7996_mac80211/target/linux/mediatek/patches-5.4/999-2952-net-ethernet-mtk_eth_soc-modify-fq-size-4K.patch +++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211/target/linux/mediatek/patches-5.4/999-2952-net-ethernet-mtk_eth_soc-modify-fq-size-4K.patch
@@ -117,8 +117,8 @@ ring->dma = dma_alloc_coherent(eth->dma_dev, MTK_DMA_SIZE * sz, &ring->phys, GFP_KERNEL); else { -- ring->dma = eth->scratch_ring + MTK_DMA_SIZE * sz; -+ ring->dma = eth->scratch_ring + MTK_DMA_FQ_SIZE * sz; +- ring->dma = eth->sram_base + MTK_DMA_SIZE * sz; ++ ring->dma = eth->sram_base + MTK_DMA_FQ_SIZE * sz; ring->phys = eth->phy_scratch_ring + - MTK_DMA_SIZE * (dma_addr_t)sz; + MTK_DMA_FQ_SIZE * (dma_addr_t)sz;