From 727d125cb59d4c83b3bc94c643d8c4a6681c7cfb Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Sat, 29 Mar 2025 14:03:26 +0000
Subject: [PATCH] ANDROID: GKI: fix crc change in __icmp_send

In the android14-6.1-lts branch, a few new include files were added to
net/ipv4/icmp.c, which ended up changing the CRC generation for
__icmp_send.  This did not show up in the -lts branch as that symbol was
not being tracked there, BUT it was added to the non-LTS branch, which
caused the mis-match to show up when merging them together.

Fix this up by providing the proper __GENKSYMS__ hack to enable the CRC
to remain stable.

Fixes: eaba5f674380 ("ipv4: icmp: Unmask upper DSCP bits in icmp_route_lookup()")
Fixes: 524c341cb16a ("net/ipv4: add tracepoint for icmp_send")
Change-Id: If28644b3fa4c474de4d2b08eef50e84b19685d74
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---
 net/ipv4/icmp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index a80fe045f206..d4bc3a8cbd7b 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -93,9 +93,11 @@
 #include <net/ip_fib.h>
 #include <net/l3mdev.h>
 #include <net/addrconf.h>
+#ifndef __GENKSYMS__
 #include <net/inet_dscp.h>
 #define CREATE_TRACE_POINTS
 #include <trace/events/icmp.h>
+#endif
 
 /*
  *	Build xmit assembly blocks