From 8f3ca3ae4e198721180c45cb86a12d4a7a921431 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 26 Jun 2021 02:19:33 +0800 Subject: [PATCH] Revert "fix 600-qca-nss-ecm-support-CORE.patch (#7184)" This reverts commit 21ad3b64622fef676be2260730f0039de24949da. --- .../600-qca-nss-ecm-support-CORE.patch | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch b/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch index 9c1f6ad15..a0931ff52 100644 --- a/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch +++ b/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch @@ -1,25 +1,22 @@ --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c -@@ -32,7 +32,8 @@ +@@ -32,12 +32,14 @@ #include - + /* Do not check the TCP window for incoming packets */ -static int nf_ct_tcp_no_window_check __read_mostly = 1; +int nf_ct_tcp_no_window_check __read_mostly = 1; +EXPORT_SYMBOL_GPL(nf_ct_tcp_no_window_check); - - #ifdef CONFIG_SHORTCUT_FE - EXPORT_SYMBOL_GPL(nf_ct_tcp_no_window_check); -@@ -41,7 +42,8 @@ EXPORT_SYMBOL_GPL(nf_ct_tcp_no_window_ch + /* "Be conservative in what you do, be liberal in what you accept from others." If it's non-zero, we mark only out of window RST segments as INVALID. */ -static int nf_ct_tcp_be_liberal __read_mostly = 0; +int nf_ct_tcp_be_liberal __read_mostly = 0; +EXPORT_SYMBOL_GPL(nf_ct_tcp_be_liberal); - - #ifdef CONFIG_SHORTCUT_FE - EXPORT_SYMBOL_GPL(nf_ct_tcp_be_liberal); + + /* If it is set to zero, we disable picking up already established + connections. */ --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -60,6 +60,9 @@ struct br_ip_list {