重命名 AX88772C_eeprom/asix.c 为 asix_mac.c

hc

2024-09-20 a36159eec6ca17402b0e146b86efaf76568dc353

 kernel/include/net/netns/netfilter.h
..
..
@@ -3,6 +3,7 @@
3
3
 #define __NETNS_NETFILTER_H
4
4
 
5
5
 #include <linux/netfilter_defs.h>
6
+#include <linux/android_kabi.h>
6
7
 
7
8
 struct proc_dir_entry;
8
9
 struct nf_logger;
..
..
@@ -22,9 +23,8 @@
22
23
 #ifdef CONFIG_NETFILTER_FAMILY_ARP
23
24
 	struct nf_hook_entries __rcu *hooks_arp[NF_ARP_NUMHOOKS];
24
25
 #endif
26
+#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE
25
27
 	struct nf_hook_entries __rcu *hooks_bridge[NF_INET_NUMHOOKS];
26
-#if IS_ENABLED(CONFIG_DECNET)
27
-	struct nf_hook_entries __rcu *hooks_decnet[NF_DN_NUMHOOKS];
28
28
 #endif
29
29
 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV4)
30
30
 	bool			defrag_ipv4;
..
..
@@ -32,5 +32,7 @@
32
32
 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
33
33
 	bool			defrag_ipv6;
34
34
 #endif
35
+
36
+	ANDROID_KABI_RESERVE(1);
35
37
 };
36
38
 #endif