From f60f770721bb17885990e5e8e4417ca7567e288d Mon Sep 17 00:00:00 2001
From: Laxman Dewangan <ldewangan@nvidia.com>
Date: Wed, 1 Nov 2023 07:08:42 +0000
Subject: [PATCH] net: Split type and declaration of page_pool in Linux 6.6.

Split the type and declaration of page_pool header for Linux6.6
based on below change from kernel 6.6:
---
commit a9ca9f9ceff382b58b488248f0c0da9e157f5d06
Author: Yunsheng Lin <linyunsheng@huawei.com>
Date:   Fri Aug 4 20:05:24 2023 +0200

    page_pool: split types and declarations from page_pool.h

---

Bug 4346767

Change-Id: I0217da34c67d952c97c6812c2760bed2fb3df3e0
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3008090
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 Makefile                                             | 3 +++
 drivers/net/ethernet/nvidia/nvethernet/ether_linux.h | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/Makefile b/Makefile
index d1eff329..43e8c0ea 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,9 @@ subdir-ccflags-y += -DNV_V4L2_ASYNC_NF_SUBDEVICE_INIT_RENAME
 
 # Deprecate PCIED Error reporting pci_enable_pcie_error_reporting
 subdir-ccflags-y += -DNV_DROP_PCIE_ERROR_REPORTING
+
+# Split types and declaration of net/page_pool.h
+subdir-ccflags-y += -DNV_SPLIT_PAGE_POOL_HEADER
 endif
 
 ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)
diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h
index dc3f1f98..83f302d1 100644
--- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h
+++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h
@@ -37,7 +37,12 @@
 #include <soc/tegra/virt/hv-ivc.h>
 #include <soc/tegra/fuse.h>
 #if IS_ENABLED(CONFIG_PAGE_POOL)
+#if defined(NV_SPLIT_PAGE_POOL_HEADER)
+#include <net/page_pool/types.h>
+#include <net/page_pool/helpers.h>
+#else
 #include <net/page_pool.h>
+#endif
 #define ETHER_PAGE_POOL
 #endif
 #include <osi_core.h>