aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2023-11-18 18:38:05 -0800
committerJakub Kicinski <kuba@kernel.org>2023-11-18 18:42:37 -0800
commit289354f21b2c3fac93e956efd45f256a88a4d997 (patch)
treedd510eeb40fcddad875a20b1a46dfd118b0620eb /net/core/dev.c
parent055dd7511f675d26fa283b35bb3dadfc7f77ed97 (diff)
downloadlinux-289354f21b2c3fac93e956efd45f256a88a4d997.tar.gz
net: partial revert of the "Make timestamping selectable: series
Revert following commits: commit acec05fb78ab ("net_tstamp: Add TIMESTAMPING SOFTWARE and HARDWARE mask") commit 11d55be06df0 ("net: ethtool: Add a command to expose current time stamping layer") commit bb8645b00ced ("netlink: specs: Introduce new netlink command to get current timestamp") commit d905f9c75329 ("net: ethtool: Add a command to list available time stamping layers") commit aed5004ee7a0 ("netlink: specs: Introduce new netlink command to list available time stamping layers") commit 51bdf3165f01 ("net: Replace hwtstamp_source by timestamping layer") commit 0f7f463d4821 ("net: Change the API of PHY default timestamp to MAC") commit 091fab122869 ("net: ethtool: ts: Update GET_TS to reply the current selected timestamp") commit 152c75e1d002 ("net: ethtool: ts: Let the active time stamping layer be selectable") commit ee60ea6be0d3 ("netlink: specs: Introduce time stamping set command") They need more time for reviews. Link: https://lore.kernel.org/all/20231118183529.6e67100c@kernel.org/ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 05ce006328926..af53f6d838ce9 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -10212,9 +10212,6 @@ int register_netdevice(struct net_device *dev)
dev->rtnl_link_state == RTNL_LINK_INITIALIZED)
rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U, GFP_KERNEL, 0, NULL);
- if (dev->ethtool_ops->get_ts_info)
- dev->ts_layer = MAC_TIMESTAMPING;
-
out:
return ret;