From c9df39dd07fcf475d5a376d4bdc2c73b309b58d7 Mon Sep 17 00:00:00 2001 From: Sheetal Tigadoli Date: Wed, 4 Jan 2023 20:15:50 +0000 Subject: [PATCH] nvethernet: register ptp MAC with notifier framework register ptp MAC with notifier framework by default since CONFIG_TEGRA_PTP_NOTIFIER has been removed and is corresponding code is enabled as default. Bug 3895413 Bug 3930304 Change-Id: Ib875079504bfcbfcaf286bb606b4fd581fc12754 Signed-off-by: Sheetal Tigadoli Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2837510 Reviewed-by: Rakesh Goyal Reviewed-by: Sumeet Gupta GVS: Gerrit_Virtual_Submit --- drivers/net/ethernet/nvidia/nvethernet/ptp.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ptp.c b/drivers/net/ethernet/nvidia/nvethernet/ptp.c index e981ad9b..5c73ce7f 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ptp.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ptp.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2019-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved */ +/* Copyright (c) 2019-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved */ #include #include "ether_linux.h" @@ -10,7 +10,6 @@ */ static DEFINE_RAW_SPINLOCK(ether_ts_lock); -#ifdef CONFIG_TEGRA_PTP_NOTIFIER /** * @brief Function used to get PTP time * @param[in] data: OSI core private data structure @@ -80,8 +79,6 @@ static inline int ether_get_hw_time(struct net_device *dev, return 0; } -#endif - /** * @brief Adjust MAC hardware time * @@ -563,10 +560,8 @@ int ether_handle_hwtstamp_ioctl(struct ether_priv_data *pdata, dev_err(pdata->dev, "Failure to enable CONFIG_PTP\n"); return -EFAULT; } -#ifdef CONFIG_TEGRA_PTP_NOTIFIER /* Register broadcasting MAC timestamp to clients */ tegra_register_hwtime_source(ether_get_hw_time, ndev); -#endif ether_config_slot_function(pdata, OSI_ENABLE); }