NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: GKI: add Android ABI padding to struct nf_conn

Browse source 
Try to mitigate potential future driver core api changes by adding
padding to struct nf_conn;

Bug: 151154716
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib18a9a929d351c66556f1f27b217cbf22b733a10
This commit is contained in:
Greg Kroah-Hartman 2020-10-30 09:52:06 +01:00 • committed by Carlos Llamas
parent 97752aa71c
commit eba9ceccd8
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/net/netfilter/nf_conntrack.h
View file

@ -16,6 +16,7 @@
#include <linux/bitops.h>
#include <linux/compiler.h>
#include <linux/android_vendor.h>
#include <linux/android_kabi.h>
#include <linux/netfilter/nf_conntrack_common.h>
#include <linux/netfilter/nf_conntrack_tcp.h>
@ -126,6 +127,8 @@ struct nf_conn {
union nf_conntrack_proto proto;
ANDROID_OEM_DATA(1);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
};
static inline struct nf_conn *