From b33c657f7ac1d5fe8b87d8595d43599ce49fa6fc Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Wed, 18 Mar 2020 11:14:13 -0700 Subject: [PATCH] ANDROID: GKI: remove condition causing sk_buff struct ABI differences Remove condition for including struct sk_buff members based on CONFIG_BRIDGE_NETFILTER config. Bug: 151840548 Test: build Signed-off-by: Suren Baghdasaryan Change-Id: Iee626843e107e8d64c3c6c4a1cc9c08f4e38f5af Merged-In: Iee626843e107e8d64c3c6c4a1cc9c08f4e38f5af --- include/linux/skbuff.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 25407c206e73..def3abeb69cd 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -250,7 +250,6 @@ struct nf_conntrack { }; #endif -#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) struct nf_bridge_info { refcount_t use; enum { @@ -278,7 +277,6 @@ struct nf_bridge_info { char neigh_header[8]; }; }; -#endif struct sk_buff_head { /* These two members must be first. */ @@ -713,9 +711,7 @@ struct sk_buff { #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) unsigned long _nfct; #endif -#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) struct nf_bridge_info *nf_bridge; -#endif unsigned int len, data_len; __u16 mac_len, @@ -3896,8 +3892,8 @@ static inline void nf_reset(struct sk_buff *skb) #endif #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) nf_bridge_put(skb->nf_bridge); - skb->nf_bridge = NULL; #endif + skb->nf_bridge = NULL; } static inline void nf_reset_trace(struct sk_buff *skb)