From f32f289c4f49efc7379600487a8b50e0ea62b830 Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Mon, 9 Mar 2020 18:12:50 -0700 Subject: [PATCH] ANDROID: GKI: net: remove conditional members causing ABI diffs Remove conditions for including struct net members based on kernel configs CONFIG_IP_SCTP, CONFIG_NETFILTER_FAMILY_BRIDGE and CONFIG_BRIDGE_NF_EBTABLES. Bug: 151115806 Test: build Signed-off-by: Suren Baghdasaryan Change-Id: I6b0e75f0976ab79ea933fe64bc73ba08c9e7c71a --- include/net/net_namespace.h | 2 -- include/net/netns/netfilter.h | 2 -- include/net/netns/x_tables.h | 3 --- 3 files changed, 7 deletions(-) diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 5007eaba207d..8026c2386988 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -113,9 +113,7 @@ struct net { #if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN) struct netns_ieee802154_lowpan ieee802154_lowpan; #endif -#if defined(CONFIG_IP_SCTP) || defined(CONFIG_IP_SCTP_MODULE) struct netns_sctp sctp; -#endif #if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE) struct netns_dccp dccp; #endif diff --git a/include/net/netns/netfilter.h b/include/net/netns/netfilter.h index ca043342c0eb..47daca947b2d 100644 --- a/include/net/netns/netfilter.h +++ b/include/net/netns/netfilter.h @@ -22,9 +22,7 @@ struct netns_nf { #ifdef CONFIG_NETFILTER_FAMILY_ARP struct nf_hook_entries __rcu *hooks_arp[NF_ARP_NUMHOOKS]; #endif -#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE struct nf_hook_entries __rcu *hooks_bridge[NF_INET_NUMHOOKS]; -#endif #if IS_ENABLED(CONFIG_DECNET) struct nf_hook_entries __rcu *hooks_decnet[NF_DN_NUMHOOKS]; #endif diff --git a/include/net/netns/x_tables.h b/include/net/netns/x_tables.h index 9bc5a12fdbb0..a0d89fd924c0 100644 --- a/include/net/netns/x_tables.h +++ b/include/net/netns/x_tables.h @@ -11,11 +11,8 @@ struct netns_xt { struct list_head tables[NFPROTO_NUMPROTO]; bool notrack_deprecated_warning; bool clusterip_deprecated_warning; -#if defined(CONFIG_BRIDGE_NF_EBTABLES) || \ - defined(CONFIG_BRIDGE_NF_EBTABLES_MODULE) struct ebt_table *broute_table; struct ebt_table *frame_filter; struct ebt_table *frame_nat; -#endif }; #endif