From c0af55a921c1867db973d8885cadc425ea15b8a3 Mon Sep 17 00:00:00 2001
From: Alfredo Cardigliano <cardigliano@ntop.org>
Date: Mon, 7 Aug 2023 19:47:12 +0200
Subject: [PATCH] Update kernel APIs for ubuntu 22 kernel 6.2

---
 drivers/intel/ice/ice-1.9.11-zc/src/ice_devlink.c | 2 ++
 drivers/intel/ice/ice-1.9.11-zc/src/ice_main.c    | 6 +++++-
 drivers/intel/ice/ice-1.9.11-zc/src/ice_repr.c    | 8 +++++++-
 drivers/intel/ice/ice-1.9.11-zc/src/kcompat.h     | 8 ++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/drivers/intel/ice/ice-1.9.11-zc/src/ice_devlink.c b/drivers/intel/ice/ice-1.9.11-zc/src/ice_devlink.c
index 2c9de2c61a..9e3afba1e5 100644
--- a/drivers/intel/ice/ice-1.9.11-zc/src/ice_devlink.c
+++ b/drivers/intel/ice/ice-1.9.11-zc/src/ice_devlink.c
@@ -357,11 +357,13 @@ static int ice_devlink_info_get(struct devlink *devlink,
 		}
 	}
 
+#ifndef NO_DEVLINK_INFO_DRIVER_NAME_PUT
 	err = devlink_info_driver_name_put(req, KBUILD_MODNAME);
 	if (err) {
 		NL_SET_ERR_MSG_MOD(extack, "Unable to set driver name");
 		goto out_free_ctx;
 	}
+#endif
 
 	ice_info_get_dsn(pf, ctx);
 
diff --git a/drivers/intel/ice/ice-1.9.11-zc/src/ice_main.c b/drivers/intel/ice/ice-1.9.11-zc/src/ice_main.c
index 073ef21841..094d669211 100644
--- a/drivers/intel/ice/ice-1.9.11-zc/src/ice_main.c
+++ b/drivers/intel/ice/ice-1.9.11-zc/src/ice_main.c
@@ -5783,7 +5783,11 @@ static int ice_register_netdev(struct ice_pf *pf)
 	if (err)
 		goto err_devlink_create;
 
-	devlink_port_type_eth_set(&pf->devlink_port, vsi->netdev);
+	devlink_port_type_eth_set(&pf->devlink_port
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0))
+	, vsi->netdev
+#endif
+	);
 #endif /* CONFIG_NET_DEVLINK */
 
 	return 0;
diff --git a/drivers/intel/ice/ice-1.9.11-zc/src/ice_repr.c b/drivers/intel/ice/ice-1.9.11-zc/src/ice_repr.c
index bc00dadc32..232447c644 100644
--- a/drivers/intel/ice/ice-1.9.11-zc/src/ice_repr.c
+++ b/drivers/intel/ice/ice-1.9.11-zc/src/ice_repr.c
@@ -323,7 +323,9 @@ static const struct net_device_ops ice_repr_netdev_ops = {
 	.ndo_change_mtu = ice_repr_change_mtu,
 #endif /* HAVE_RHEL7_EXTENDED_MIN_MAX_MTU */
 #ifdef HAVE_DEVLINK_PORT_ATTR_PCI_VF
+#ifdef HAVE_NDO_GET_DEVLINK_PORT
 	.ndo_get_devlink_port = ice_repr_get_devlink_port,
+#endif
 #endif /* HAVE_DEVLINK_PORT_ATTR_PCI_VF */
 #ifdef HAVE_TC_SETUP_CLSFLOWER
 #ifdef HAVE_RHEL7_NETDEV_OPS_EXT_NDO_SETUP_TC
@@ -443,7 +445,11 @@ static int ice_repr_add(struct ice_vf *vf)
 
 #if IS_ENABLED(CONFIG_NET_DEVLINK)
 #ifdef HAVE_DEVLINK_PORT_ATTR_PCI_VF
-	devlink_port_type_eth_set(&vf->devlink_port, repr->netdev);
+	devlink_port_type_eth_set(&vf->devlink_port
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0))
+	, repr->netdev
+#endif
+	);
 #endif /* HAVE_DEVLINK_PORT_ATTR_PCI_VF */
 #endif /* CONFIG_NET_DEVLINK */
 
diff --git a/drivers/intel/ice/ice-1.9.11-zc/src/kcompat.h b/drivers/intel/ice/ice-1.9.11-zc/src/kcompat.h
index dd7e638bde..8b164979cf 100644
--- a/drivers/intel/ice/ice-1.9.11-zc/src/kcompat.h
+++ b/drivers/intel/ice/ice-1.9.11-zc/src/kcompat.h
@@ -3545,6 +3545,14 @@ _kc_netif_napi_add(struct net_device *dev, struct napi_struct *napi,
 
 #endif
 
+/*****************************************************************************/
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0))
+#ifdef HAVE_NDO_GET_DEVLINK_PORT
+#undef HAVE_NDO_GET_DEVLINK_PORT
+#endif
+#define NO_DEVLINK_INFO_DRIVER_NAME_PUT
+#endif
+
 /*
  * Load the implementations file which actually defines kcompat backports.
  * Legacy backports still exist in this file, but all new backports must be