From c85b4ebbc1fe85ad070e574c3a24ffa54ae4993b Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Thu, 26 May 2022 23:40:27 +0800
Subject: [PATCH] ramips: mt7621: switch to new ethernet driver

---
 target/linux/ramips/modules.mk        | 15 +++++++++++++++
 target/linux/ramips/mt7621/config-5.4 | 20 +++++++++++---------
 target/linux/ramips/mt7621/target.mk  |  2 +-
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/target/linux/ramips/modules.mk b/target/linux/ramips/modules.mk
index 6f199c46a..b667715e3 100644
--- a/target/linux/ramips/modules.mk
+++ b/target/linux/ramips/modules.mk
@@ -133,3 +133,18 @@ define KernelPackage/sound-mt7620/description
 endef
 
 $(eval $(call KernelPackage,sound-mt7620))
+
+define KernelPackage/mtk-hnat
+  SUBMENU:=Network Devices
+  TITLE:=MediaTek MT762x HW NAT driver
+  DEPENDS:=@TARGET_ramips @TARGET_ramips_mt7621 +kmod-nf-flow
+  KCONFIG:= \
+	CONFIG_BRIDGE_NETFILTER=y \
+	CONFIG_NET_MEDIATEK_HNAT \
+	CONFIG_NETFILTER_FAMILY_BRIDGE=y
+  FILES:= \
+	$(LINUX_DIR)/drivers/net/ethernet/mtk/mtk_hnat/mtkhnat.ko
+  AUTOLOAD:=$(call AutoLoad,55,mtkhnat)
+endef
+
+$(eval $(call KernelPackage,mtk-hnat))
diff --git a/target/linux/ramips/mt7621/config-5.4 b/target/linux/ramips/mt7621/config-5.4
index 94b5ae431..32e704231 100644
--- a/target/linux/ramips/mt7621/config-5.4
+++ b/target/linux/ramips/mt7621/config-5.4
@@ -150,6 +150,7 @@ CONFIG_MIPS_PERF_SHARED_TC_COUNTERS=y
 CONFIG_MIPS_RAW_APPENDED_DTB=y
 CONFIG_MIPS_SPRAM=y
 CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_MT753X_GSW=y
 CONFIG_MT7621_WDT=y
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CMDLINE_PARTS=y
@@ -179,16 +180,17 @@ CONFIG_NET_DSA=y
 CONFIG_NET_DSA_MT7530=y
 CONFIG_NET_DSA_TAG_MTK=y
 CONFIG_NET_FLOW_LIMIT=y
-CONFIG_NET_MEDIATEK_SOC=y
-CONFIG_NET_RALINK_GSW_MT7621=y
-CONFIG_NET_RALINK_MDIO=y
-CONFIG_NET_RALINK_MDIO_MT7620=y
-CONFIG_NET_RALINK_MT7621=y
-CONFIG_NET_RALINK_OFFLOAD=y
-CONFIG_NET_RALINK_SOC=y
+CONFIG_NET_MEDIATEK_SOC_GE=y
+# CONFIG_NET_RALINK_GSW_MT7621 is not set
+# CONFIG_NET_RALINK_MDIO is not set
+# CONFIG_NET_RALINK_MDIO_MT7620 is not set
+# CONFIG_NET_RALINK_MT7621 is not set
+# CONFIG_NET_RALINK_OFFLOAD is not set
+# CONFIG_NET_RALINK_SOC=y
 CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_VENDOR_MEDIATEK=y
-CONFIG_NET_VENDOR_RALINK=y
+# CONFIG_NET_VENDOR_MEDIATEK is not set
+# CONFIG_NET_VENDOR_RALINK is not set
+CONFIG_NET_VENDOR_RAW_MEDIATEK=y
 CONFIG_NR_CPUS=4
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
diff --git a/target/linux/ramips/mt7621/target.mk b/target/linux/ramips/mt7621/target.mk
index f7d87443b..1fd4039d2 100644
--- a/target/linux/ramips/mt7621/target.mk
+++ b/target/linux/ramips/mt7621/target.mk
@@ -10,7 +10,7 @@ KERNELNAME:=vmlinux vmlinuz
 # make Kernel/CopyImage use $LINUX_DIR/vmlinuz
 IMAGES_DIR:=../../..
 
-DEFAULT_PACKAGES += kmod-crypto-hw-eip93 wpad-openssl swconfig
+DEFAULT_PACKAGES += kmod-mtk-hnat wpad-openssl swconfig
 
 define Target/Description
 	Build firmware images for Ralink MT7621 based boards.