Follow Upstream

.github/workflows/r2s_lean_passwall_clash.yml

@@ -42,7 +42,7 @@ jobs:
 
       - name: Patch Kernel
         run: |
-          . patch_kernel_5.4.22.sh
+          . patch_kernel_5.4.sh
 
       - name: Rebase on Lean
         run: |

add_fullconenat.diff

 diff --git a/arch/arm64/configs/nanopi-r2_linux_defconfig b/arch/arm64/configs/nanopi-r2_linux_defconfig
-index 3f3b7e32f3f2..794537f2a9df 100644
+index 240a9bf57..9f8f37ca7 100644
 --- a/arch/arm64/configs/nanopi-r2_linux_defconfig
 +++ b/arch/arm64/configs/nanopi-r2_linux_defconfig
-@@ -1664,3 +1664,4 @@ CONFIG_SCHEDSTATS=y
+@@ -1665,3 +1665,4 @@ CONFIG_SCHEDSTATS=y
  CONFIG_DEBUG_SPINLOCK=y
  CONFIG_FUNCTION_TRACER=y
  CONFIG_BLK_DEV_IO_TRACE=y
 +CONFIG_NETFILTER_XT_TARGET_FULLCONENAT=y
 diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
-index f17b402111ce..5af7577fd9ff 100644
+index f17b40211..99f691a67 100644
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig
 @@ -239,6 +239,15 @@ config IP_NF_TARGET_NETMAP
  	(e.g. when running oldconfig). It selects
  	CONFIG_NETFILTER_XT_TARGET_NETMAP.
- 
+
 +config IP_NF_TARGET_FULLCONENAT
-+  tristate "FULLCONENAT target support"
-+  depends on NETFILTER_ADVANCED
-+  select NETFILTER_XT_TARGET_FULLCONENAT
-+  ---help---
-+  This is a backwards-compat option for the user's convenience
-+  (e.g. when running oldconfig). It selects
-+  CONFIG_NETFILTER_XT_TARGET_FULLCONENAT.
++	tristate "FULLCONENAT target support"
++	depends on NETFILTER_ADVANCED
++	select NETFILTER_XT_TARGET_FULLCONENAT
++	---help---
++	This is a backwards-compat option for the user's convenience
++	(e.g. when running oldconfig). It selects
++	CONFIG_NETFILTER_XT_TARGET_FULLCONENAT.
 +
  config IP_NF_TARGET_REDIRECT
  	tristate "REDIRECT target support"
  	depends on NETFILTER_ADVANCED
 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
-index 91efae88e8c2..6fd1c3cfdc23 100644
+index 91efae88e..17f5c748a 100644
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -956,6 +956,15 @@ config NETFILTER_XT_TARGET_NETMAP
- 
+@@ -956,6 +956,14 @@ config NETFILTER_XT_TARGET_NETMAP
+
  	To compile it as a module, choose M here. If unsure, say N.
- 
+
 +config NETFILTER_XT_TARGET_FULLCONENAT
 +	tristate '"FULLCONENAT" target support'
 +	depends on NF_NAT
@@ -42,25 +42,24 @@ index 91efae88e8c2..6fd1c3cfdc23 100644
 +	Full Cone NAT
 +
 +	To compile it as a module, choose M here. If unsure, say N.
-+
 +
  config NETFILTER_XT_TARGET_NFLOG
  	tristate '"NFLOG" target support'
  	default m if NETFILTER_ADVANCED=n
 diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
-index 4fc075b612fe..eea8bfd0b2bf 100644
+index 4fc075b61..2b588d5a5 100644
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
 @@ -209,3 +209,6 @@ obj-$(CONFIG_IP_SET) += ipset/
- 
+
  # IPVS
  obj-$(CONFIG_IP_VS) += ipvs/
 +
++# Full cone NAT
 +obj-$(CONFIG_NETFILTER_XT_TARGET_FULLCONENAT) += xt_FULLCONENAT.o
-+
 diff --git a/net/netfilter/xt_FULLCONENAT.c b/net/netfilter/xt_FULLCONENAT.c
 new file mode 100644
-index 000000000000..8555b54e2dc6
+index 000000000..8555b54e2
 --- /dev/null
 +++ b/net/netfilter/xt_FULLCONENAT.c
 @@ -0,0 +1,733 @@
@@ -203,7 +202,7 @@ index 000000000000..8555b54e2dc6
 +  hash_add(mapping_table_by_ext_port, &p_new->node_by_ext_port, port);
 +  hash_add(mapping_table_by_int_src, &p_new->node_by_int_src, hash_src);
 +
-+  pr_debug("xt_FULLCONENAT: new mapping allocated for %pI4:%d ==> %d\n", 
++  pr_debug("xt_FULLCONENAT: new mapping allocated for %pI4:%d ==> %d\n",
 +    &p_new->int_addr, p_new->int_port, p_new->port);
 +
 +  return p_new;
@@ -344,7 +343,7 @@ index 000000000000..8555b54e2dc6
 +    item = list_entry(iter, struct tuple_list, list);
 +
 +    /* we dont know the conntrack direction for now so we try in both ways. */
-+    ct_tuple = &(item->tuple_original); 
++    ct_tuple = &(item->tuple_original);
 +    ip = (ct_tuple->src).u3.ip;
 +    port = be16_to_cpu((ct_tuple->src).u.udp.port);
 +    mapping = get_mapping_by_int_src(ip, port);

patch_kernel_5.4.22.sh → patch_kernel_5.4.sh

@@ -6,7 +6,7 @@ wget https://github.com/armbian/build/raw/master/patch/kernel/rockchip64-dev/RK3
 git apply RK3328-enable-1512mhz-opp.patch
 cd ../
 git clone https://github.com/openwrt/openwrt && cd openwrt/
-git checkout 4e0c54bc5bc8381e031af5147b66b4dadeecc626
+#git checkout 4e0c54bc5bc8381e031af5147b66b4dadeecc626
 rm target/linux/generic/pending-5.4/403-mtd-hook-mtdsplit-to-Kbuild.patch
 rm target/linux/generic/hack-5.4/700-swconfig_switch_drivers.patch
 ./scripts/patch-kernel.sh ../kernel target/linux/generic/backport-5.4