[][MAC80211][hnat][Fix patch conflict issue]
[Description]
Fix patch conflict issue.
[Release-log]
N/A
Change-Id: I39b2d332aa07162329853f07a819b872a6fbfb54
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9664021
diff --git a/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3009-add-wed-ser-support.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3009-add-wed-ser-support.patch
index 1484980..fcca9cf 100644
--- a/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3009-add-wed-ser-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3009-add-wed-ser-support.patch
@@ -22,7 +22,7 @@
+#ifdef CONFIG_NET_MEDIATEK_SOC_WED
+ mtk_wed_fe_reset();
+#else
- if (mtk_reset_flag == MTK_FE_STOP_TRAFFIC) {
+ if (eth->reset.event == MTK_FE_STOP_TRAFFIC) {
pr_info("send MTK_FE_STOP_TRAFFIC event !\n");
call_netdevice_notifiers(MTK_FE_STOP_TRAFFIC,
@@ -4820,6 +4823,7 @@ static void mtk_pending_work(struct work_struct *work)
@@ -40,7 +40,7 @@
+#ifdef CONFIG_NET_MEDIATEK_SOC_WED
+ mtk_wed_fe_reset_complete();
+#else
- if (mtk_reset_flag == MTK_FE_STOP_TRAFFIC) {
+ if (eth->reset.event == MTK_FE_STOP_TRAFFIC) {
pr_info("send MTK_FE_START_TRAFFIC event !\n");
call_netdevice_notifiers(MTK_FE_START_TRAFFIC,
@@ -4867,6 +4874,7 @@ static void mtk_pending_work(struct work_struct *work)