| commit | d619f335fd314da09f4ea0d577fad2ef6a96ef41 | [log] [tgz] |
|---|---|---|
| author | developer <developer@mediatek.com> | Mon Sep 09 16:38:52 2024 +0800 |
| committer | developer <developer@mediatek.com> | Tue Sep 10 23:24:27 2024 +0800 |
| tree | 0607fa1d9bd44bb290407a4e03c11f83e3dd71ad | |
| parent | 1791e3d251db067c90d45742d1fef1046809aaec [diff] |
[][MAC80211][hnat][Fix patch conflict issue] [Description] Fix patch conflict issue. [Release-log] N/A Change-Id: Ia05a0939085d1c27e5e2155d67f94a77bf447d20 Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9611871
diff --git a/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3001-mt7622-backport-nf-hw-offload-framework-and-upstream.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3001-mt7622-backport-nf-hw-offload-framework-and-upstream.patch index ec39c96..c700dcc 100644 --- a/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3001-mt7622-backport-nf-hw-offload-framework-and-upstream.patch +++ b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3001-mt7622-backport-nf-hw-offload-framework-and-upstream.patch
@@ -223,9 +223,9 @@ bool has_sram; struct { @@ -1947,6 +1958,9 @@ struct mtk_eth { - spinlock_t syscfg0_lock; + int ip_align; + spinlock_t syscfg0_lock; struct notifier_block netdevice_notifier; - struct timer_list mtk_dma_monitor_timer; + + struct mtk_ppe ppe; + struct rhashtable flow_table;