From a3cd27f5c4f88951d178826babaea5b82c0937d3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 14 Jul 2021 20:15:43 +0200 Subject: [PATCH] ANDROID: GKI: fix up crc change in ip.h Commit 92071a2b8f7f ("net: lwtunnel: handle MTU calculation in forwading") was backported to 5.10.50 and it caused a crc change in include/net/ip.h due to a new .h file being included. No real abi change happened here, so just #ifdef the .h file out when doing the crc check. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: I1bad0458bc0f9130239fc94ca982e800681cd443 --- include/net/ip.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/net/ip.h b/include/net/ip.h index a887442a1a6f..ae7c2214b1ff 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -31,7 +31,9 @@ #include #include #include +#ifndef __GENKSYMS__ #include +#endif #define IPV4_MAX_PMTU 65535U /* RFC 2675, Section 5.1 */ #define IPV4_MIN_MTU 68 /* RFC 791 */