AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/include/net/netns/ipv4.h
..
..
@@ -10,6 +10,7 @@
10
10
 #include <net/inet_frag.h>
11
11
 #include <linux/rcupdate.h>
12
12
 #include <linux/siphash.h>
13
+#include <linux/android_kabi.h>
13
14
 
14
15
 struct tcpm_hash_bucket;
15
16
 struct ctl_table_header;
..
..
@@ -61,7 +62,7 @@
61
62
 #endif
62
63
 	bool			fib_has_custom_local_routes;
63
64
 #ifdef CONFIG_IP_ROUTE_CLASSID
64
-	int			fib_num_tclassid_users;
65
+	atomic_t		fib_num_tclassid_users;
65
66
 #endif
66
67
 	struct hlist_head	*fib_table_hash;
67
68
 	bool			fib_offload_disabled;
..
..
@@ -72,7 +73,7 @@
72
73
 
73
74
 	struct inet_peer_base	*peers;
74
75
 	struct sock  * __percpu	*tcp_sk;
75
-	struct netns_frags	frags;
76
+	struct fqdir		*fqdir;
76
77
 #ifdef CONFIG_NETFILTER
77
78
 	struct xt_table		*iptable_filter;
78
79
 	struct xt_table		*iptable_mangle;
..
..
@@ -101,11 +102,17 @@
101
102
 	int sysctl_ip_fwd_use_pmtu;
102
103
 	int sysctl_ip_fwd_update_priority;
103
104
 	int sysctl_ip_nonlocal_bind;
105
+	int sysctl_ip_autobind_reuse;
104
106
 	/* Shall we try to damage output packets if routing dev changes? */
105
107
 	int sysctl_ip_dynaddr;
106
108
 	int sysctl_ip_early_demux;
109
+#ifdef CONFIG_NET_L3_MASTER_DEV
110
+	int sysctl_raw_l3mdev_accept;
111
+#endif
107
112
 	int sysctl_tcp_early_demux;
108
113
 	int sysctl_udp_early_demux;
114
+
115
+	int sysctl_nexthop_compat_mode;
109
116
 
110
117
 	int sysctl_fwmark_reflect;
111
118
 	int sysctl_tcp_fwmark_accept;
..
..
@@ -113,6 +120,7 @@
113
120
 	int sysctl_tcp_l3mdev_accept;
114
121
 #endif
115
122
 	int sysctl_tcp_mtu_probing;
123
+	int sysctl_tcp_mtu_probe_floor;
116
124
 	int sysctl_tcp_base_mss;
117
125
 	int sysctl_tcp_min_snd_mss;
118
126
 	int sysctl_tcp_probe_threshold;
..
..
@@ -150,6 +158,7 @@
150
158
 	int sysctl_tcp_adv_win_scale;
151
159
 	int sysctl_tcp_frto;
152
160
 	int sysctl_tcp_nometrics_save;
161
+	int sysctl_tcp_no_ssthresh_metrics_save;
153
162
 	int sysctl_tcp_moderate_rcvbuf;
154
163
 	int sysctl_tcp_tso_win_divisor;
155
164
 	int sysctl_tcp_workaround_signed_windows;
..
..
@@ -165,6 +174,7 @@
165
174
 	int sysctl_tcp_rmem[3];
166
175
 	int sysctl_tcp_comp_sack_nr;
167
176
 	unsigned long sysctl_tcp_comp_sack_delay_ns;
177
+	unsigned long sysctl_tcp_comp_sack_slack_ns;
168
178
 	struct inet_timewait_death_row tcp_death_row;
169
179
 	int sysctl_max_syn_backlog;
170
180
 	int sysctl_tcp_fastopen;
..
..
@@ -174,6 +184,7 @@
174
184
 	unsigned int sysctl_tcp_fastopen_blackhole_timeout;
175
185
 	atomic_t tfo_active_disable_times;
176
186
 	unsigned long tfo_active_disable_stamp;
187
+	int sysctl_tcp_reflect_tos;
177
188
 
178
189
 	int sysctl_udp_wmem_min;
179
190
 	int sysctl_udp_rmem_min;
..
..
@@ -193,6 +204,7 @@
193
204
 
194
205
 #ifdef CONFIG_SYSCTL
195
206
 	unsigned long *sysctl_local_reserved_ports;
207
+	unsigned long *sysctl_local_unbindable_ports;
196
208
 	int sysctl_ip_prot_sock;
197
209
 #endif
198
210
 
..
..
@@ -217,5 +229,7 @@
217
229
 
218
230
 	atomic_t	rt_genid;
219
231
 	siphash_key_t	ip_id_key;
232
+
233
+	ANDROID_KABI_RESERVE(1);
220
234
 };
221
235
 #endif