fix 600-qca-nss-ecm-support-CORE.patch (#7184)

This commit is contained in:
Hugo Yuan 2021-06-26 01:30:04 +08:00 committed by GitHub
parent ce2874f528
commit 21ad3b6462
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,22 +1,25 @@
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -32,12 +32,14 @@
@@ -32,7 +32,8 @@
#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
/* 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);
/* If it is set to zero, we disable picking up already established
connections. */
#ifdef CONFIG_SHORTCUT_FE
EXPORT_SYMBOL_GPL(nf_ct_tcp_be_liberal);
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -60,6 +60,9 @@ struct br_ip_list {