~hc/RK356X_SDK_RELEASE.git

..	..	@@ -7,7 +7,9 @@
7	7
8	8	#ifndef __NETNS_IPV6_H__
9	9	#define __NETNS_IPV6_H__
	10	+#include <linux/android_kabi.h>
10	11	#include <net/dst_ops.h>
	12	+#include <uapi/linux/icmpv6.h>
11	13
12	14	struct ctl_table_header;
13	15
..	..	@@ -33,6 +35,10 @@
33	35	int auto_flowlabels;
34	36	int icmpv6_time;
35	37	int icmpv6_echo_ignore_all;
	38	+ int icmpv6_echo_ignore_multicast;
	39	+ int icmpv6_echo_ignore_anycast;
	40	+ DECLARE_BITMAP(icmpv6_ratemask, ICMPV6_MSG_MAX + 1);
	41	+ unsigned long *icmpv6_ratemask_ptr;
36	42	int anycast_src_echo_reply;
37	43	int ip_nonlocal_bind;
38	44	int fwmark_reflect;
..	..	@@ -45,6 +51,7 @@
45	51	int max_dst_opts_len;
46	52	int max_hbh_opts_len;
47	53	int seg6_flowlabel;
	54	+ bool skip_notify_on_dev_down;
48	55	};
49	56
50	57	struct netns_ipv6 {
..	..	@@ -52,7 +59,7 @@
52	59	struct ipv6_devconf *devconf_all;
53	60	struct ipv6_devconf *devconf_dflt;
54	61	struct inet_peer_base *peers;
55		- struct netns_frags frags;
	62	+ struct fqdir *fqdir;
56	63	#ifdef CONFIG_NETFILTER
57	64	struct xt_table *ip6table_filter;
58	65	struct xt_table *ip6table_mangle;
..	..	@@ -77,12 +84,15 @@
77	84	#ifdef CONFIG_IPV6_MULTIPLE_TABLES
78	85	unsigned int fib6_rules_require_fldissect;
79	86	bool fib6_has_custom_rules;
	87	+#ifdef CONFIG_IPV6_SUBTREES
	88	+ unsigned int fib6_routes_require_src;
	89	+#endif
80	90	struct rt6_info *ip6_prohibit_entry;
81	91	struct rt6_info *ip6_blk_hole_entry;
82	92	struct fib6_table *fib6_local_tbl;
83	93	struct fib_rules_ops *fib6_rules_ops;
84	94	#endif
85		- struct sock **icmp_sk;
	95	+ struct sock * __percpu *icmp_sk;
86	96	struct sock *ndisc_sk;
87	97	struct sock *tcp_sk;
88	98	struct sock *igmp_sk;
..	..	@@ -106,11 +116,13 @@
106	116	spinlock_t lock;
107	117	u32 seq;
108	118	} ip6addrlbl_table;
	119	+
	120	+ ANDROID_KABI_RESERVE(1);
109	121	};
110	122
111	123	#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
112	124	struct netns_nf_frag {
113		- struct netns_frags frags;
	125	+ struct fqdir *fqdir;
114	126	};
115	127	#endif
116	128