From 34fd8cb7e75c2dca2cd2d850378b78cadcc21f4e Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Mon, 31 Jan 2022 15:14:24 +0100
Subject: [PATCH] ANDROID: Fix CRC issue up with xfrm headers in 5.10.94

Two changes to net/xfrm/xfrm_policy.c in the 5.10.94 release ended up
changing the CRC for a xfrm function, despite no actual change
happening.  Fix this up by putting __GENKSYMS__ bounds on the include
files to preserve the CRC.

Bug: 161946584
Fixes: 7f2ca96bd266 ("xfrm: Don't accidentally set RTO_ONLINK in decode_session4()")
Fixes: 56f974d583fc ("xfrm: fix policy lookup for ipv6 gre packets")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia09ea8d4439ec276716396f40dc82c0958624690
---
 net/xfrm/xfrm_policy.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 8b4c5965a569..718c79567ec6 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -31,10 +31,14 @@
 #include <linux/if_tunnel.h>
 #include <net/dst.h>
 #include <net/flow.h>
+#ifndef __GENKSYMS__
 #include <net/inet_ecn.h>
+#endif
 #include <net/xfrm.h>
 #include <net/ip.h>
+#ifndef __GENKSYMS__
 #include <net/gre.h>
+#endif
 #if IS_ENABLED(CONFIG_IPV6_MIP6)
 #include <net/mip6.h>
 #endif