From 5cdaba14b853ce2240d6d1224565aa765bcb07a7 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Wed, 18 Oct 2023 14:17:46 +0000
Subject: [PATCH] ANDROID: GKI: add guards for an include file in
 net/ethtool/ioctl.c

In commit 82f9af464e01 ("ipv6: Remove in6addr_any alternatives."), the
6.1.54 release adds a new include file, which changes the crc generation
of some of the public symbols in that file.  Fix that up by adding a

Bug: 161946584
Fixes: 82f9af464e01 ("ipv6: Remove in6addr_any alternatives.")
Change-Id: I495d21a761e3724ed1ca605496b2b85acb7a77f5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---
 net/ethtool/ioctl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index e31d1247b9f0..65ec4826cb9e 100644
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -27,7 +27,9 @@
 #include <linux/net.h>
 #include <linux/pm_runtime.h>
 #include <net/devlink.h>
+#ifndef __GENKSYMS__
 #include <net/ipv6.h>
+#endif
 #include <net/xdp_sock_drv.h>
 #include <net/flow_offload.h>
 #include <linux/ethtool_netlink.h>