diff --git a/drivers/net/ethernet/nvidia/nvethernet/ethtool.c b/drivers/net/ethernet/nvidia/nvethernet/ethtool.c
index e607e92b..235d5bf1 100644
--- a/drivers/net/ethernet/nvidia/nvethernet/ethtool.c
+++ b/drivers/net/ethernet/nvidia/nvethernet/ethtool.c
@@ -863,7 +863,11 @@ static int ether_set_pauseparam(struct net_device *ndev,
  * @return zero on success
  */
 static int ether_get_ts_info(struct net_device *ndev,
+#if defined(NV_ETHTOOL_KERNEL_ETHTOOL_TS_INFO_STRUCT_PRESENT) /* Linux v6.11 */
+		struct kernel_ethtool_ts_info *info)
+#else
 		struct ethtool_ts_info *info)
+#endif
 {
 	struct ether_priv_data *pdata = netdev_priv(ndev);
 
diff --git a/scripts/conftest/Makefile b/scripts/conftest/Makefile
index f8d18bbc..36d545ed 100644
--- a/scripts/conftest/Makefile
+++ b/scripts/conftest/Makefile
@@ -118,6 +118,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fb_helper_struct_has_info_arg
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_mode_config_struct_has_fb_base_arg
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_scdc_get_set_has_struct_drm_connector_arg
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += ethtool_keee_struct_present
+NV_CONFTEST_FUNCTION_COMPILE_TESTS += ethtool_kernel_ethtool_ts_info_struct_present
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += ethtool_ops_get_set_coalesce_has_coal_and_extack_args
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += ethtool_ops_get_set_ringparam_has_ringparam_and_extack_args
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += ethtool_ops_get_set_rxfh_has_rxfh_param_args
diff --git a/scripts/conftest/conftest.sh b/scripts/conftest/conftest.sh
index b8a24b70..e70cf6d8 100755
--- a/scripts/conftest/conftest.sh
+++ b/scripts/conftest/conftest.sh
@@ -7057,6 +7057,23 @@ compile_test() {
             compile_check_conftest "$CODE" "NV_ETHTOOL_KEEE_STRUCT_PRESENT" "" "types"
         ;;
 
+        ethtool_kernel_ethtool_ts_info_struct_present)
+            #
+            # Determine if the 'struct kernel_ethtool_ts_info' is present.
+            #
+            # Commit 2111375b85ad ("net: Add struct kernel_ethtool_ts_info")
+            # replaced struct ethtool_ts_info with kernel_ethtool_ts_info in
+            # Linux v6.11.
+            #
+            CODE="
+            #include <linux/ethtool.h>
+            int conftest(struct kernel_ethtool_ts_info *info) {
+                return 0;
+            }"
+
+            compile_check_conftest "$CODE" "NV_ETHTOOL_KERNEL_ETHTOOL_TS_INFO_STRUCT_PRESENT" "" "types"
+        ;;
+
         ethtool_ops_get_set_coalesce_has_coal_and_extack_args)
             #
             # Determine if the 'get_coalesce' and 'set_coalesce' ethtool_ops