rtl88x2CE_WiFi_linux add concurrent mode

hc

2024-09-20 cf4ce59b3b70238352c7f1729f0f7223214828ad

 kernel/include/net/netns/conntrack.h
..
..
@@ -18,25 +18,15 @@
18
18
 struct ctl_table_header;
19
19
 struct nf_conntrack_ecache;
20
20
 
21
-struct nf_proto_net {
22
-#ifdef CONFIG_SYSCTL
23
-	struct ctl_table_header *ctl_table_header;
24
-	struct ctl_table        *ctl_table;
25
-#endif
26
-	unsigned int		users;
27
-};
28
-
29
21
 struct nf_generic_net {
30
-	struct nf_proto_net pn;
31
22
 	unsigned int timeout;
32
23
 };
33
24
 
34
25
 struct nf_tcp_net {
35
-	struct nf_proto_net pn;
36
26
 	unsigned int timeouts[TCP_CONNTRACK_TIMEOUT_MAX];
37
-	unsigned int tcp_loose;
38
-	unsigned int tcp_be_liberal;
39
-	unsigned int tcp_max_retrans;
27
+	int tcp_loose;
28
+	int tcp_be_liberal;
29
+	int tcp_max_retrans;
40
30
 };
41
31
 
42
32
 enum udp_conntrack {
..
..
@@ -46,18 +36,15 @@
46
36
 };
47
37
 
48
38
 struct nf_udp_net {
49
-	struct nf_proto_net pn;
50
39
 	unsigned int timeouts[UDP_CT_MAX];
51
40
 };
52
41
 
53
42
 struct nf_icmp_net {
54
-	struct nf_proto_net pn;
55
43
 	unsigned int timeout;
56
44
 };
57
45
 
58
46
 #ifdef CONFIG_NF_CT_PROTO_DCCP
59
47
 struct nf_dccp_net {
60
-	struct nf_proto_net pn;
61
48
 	int dccp_loose;
62
49
 	unsigned int dccp_timeout[CT_DCCP_MAX + 1];
63
50
 };
..
..
@@ -65,8 +52,20 @@
65
52
 
66
53
 #ifdef CONFIG_NF_CT_PROTO_SCTP
67
54
 struct nf_sctp_net {
68
-	struct nf_proto_net pn;
69
55
 	unsigned int timeouts[SCTP_CONNTRACK_MAX];
56
+};
57
+#endif
58
+
59
+#ifdef CONFIG_NF_CT_PROTO_GRE
60
+enum gre_conntrack {
61
+	GRE_CT_UNREPLIED,
62
+	GRE_CT_REPLIED,
63
+	GRE_CT_MAX
64
+};
65
+
66
+struct nf_gre_net {
67
+	struct list_head	keymap_list;
68
+	unsigned int		timeouts[GRE_CT_MAX];
70
69
 };
71
70
 #endif
72
71
 
..
..
@@ -81,6 +80,9 @@
81
80
 #endif
82
81
 #ifdef CONFIG_NF_CT_PROTO_SCTP
83
82
 	struct nf_sctp_net	sctp;
83
+#endif
84
+#ifdef CONFIG_NF_CT_PROTO_GRE
85
+	struct nf_gre_net	gre;
84
86
 #endif
85
87
 };
86
88
 
..
..
@@ -97,18 +99,14 @@
97
99
 	struct delayed_work ecache_dwork;
98
100
 	bool ecache_dwork_pending;
99
101
 #endif
102
+	bool			auto_assign_helper_warned;
100
103
 #ifdef CONFIG_SYSCTL
101
104
 	struct ctl_table_header	*sysctl_header;
102
-	struct ctl_table_header	*acct_sysctl_header;
103
-	struct ctl_table_header	*tstamp_sysctl_header;
104
-	struct ctl_table_header	*event_sysctl_header;
105
-	struct ctl_table_header	*helper_sysctl_header;
106
105
 #endif
107
106
 	unsigned int		sysctl_log_invalid; /* Log invalid packets */
108
107
 	int			sysctl_events;
109
108
 	int			sysctl_acct;
110
109
 	int			sysctl_auto_assign_helper;
111
-	bool			auto_assign_helper_warned;
112
110
 	int			sysctl_tstamp;
113
111
 	int			sysctl_checksum;
114
112