shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: GKI: remove condition causing sk_buff struct ABI differences

Browse Source 
Remove condition for including struct sk_buff members based on
CONFIG_BRIDGE_NETFILTER config.

Bug: 151840548
Test: build
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Iee626843e107e8d64c3c6c4a1cc9c08f4e38f5af
Merged-In: Iee626843e107e8d64c3c6c4a1cc9c08f4e38f5af
This commit is contained in:
Suren Baghdasaryan
2020-03-18 11:14:13 -07:00
parent 13630d0555
commit b33c657f7a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/skbuff.h
View File

@@ -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)