Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f32f289c authored by Suren Baghdasaryan's avatar Suren Baghdasaryan
Browse files

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: default avatarSuren Baghdasaryan <surenb@google.com>
Change-Id: I6b0e75f0976ab79ea933fe64bc73ba08c9e7c71a
parent c9b2421c

include/net/net_namespace.h

+0 −2
Original line number Diff line number Diff line
@@ -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

include/net/netns/netfilter.h

+0 −2
Original line number Diff line number Diff line
@@ -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

include/net/netns/x_tables.h

+0 −3
Original line number Diff line number Diff line
@@ -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