From 280c9b98aa6ca04f88197ed8e306fc10c9e0cb97 Mon Sep 17 00:00:00 2001
From: Vignesh Saravanaperumal <vignesh1.s@samsung.com>
Date: Thu, 8 Jul 2021 07:31:18 -0700
Subject: [PATCH] ANDROID: GKI: add vendor padding variable in struct nf_conn

Some vendors want to add things to 'struct nf_conn', so give them a u64
where they can then have a pointer off to their private data and they
can do whatever they want to do without breaking or changing any abi for
anyone else.

Note, usually an android trace hook is also needed to use this properly,
so be aware that this will be required as well.

Bug: 171013716
Signed-off-by: Vignesh Saravanaperumal <vignesh1.s@samsung.com>
Change-Id: I245c162ee3fb083e3f39cf7bec3bd78cb624e005
---
 include/net/netfilter/nf_conntrack.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 7a44164f147c..878d0ce81321 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -15,6 +15,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>
@@ -109,6 +110,8 @@ struct nf_conn {
 
 	ANDROID_KABI_RESERVE(1);
 	ANDROID_KABI_RESERVE(2);
+
+	ANDROID_OEM_DATA(1);
 };
 
 static inline struct nf_conn *