diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-07-15 07:13:00 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-07-15 08:02:30 -0700 |
| commit | 30b3560050486275c6207c8c90c0d53a7cc73ac1 (patch) | |
| tree | ba82e7543efefbd0cdfc4627f9fecc4df20b2da2 /drivers/net/dsa/microchip/ksz_ptp.c | |
| parent | 9283477e28913c1e7625c0a8d6959745e2431533 (diff) | |
| parent | 2111375b85ad173d58e7b8604246a3de60950ac8 (diff) | |
| download | linux-30b3560050486275c6207c8c90c0d53a7cc73ac1.tar.gz linux-30b3560050486275c6207c8c90c0d53a7cc73ac1.tar.bz2 linux-30b3560050486275c6207c8c90c0d53a7cc73ac1.zip | |
Merge branch 'net-make-timestamping-selectable'
First part of "net: Make timestamping selectable" from Kory Maincent.
Change the driver-facing type already to lower rebasing pain.
Link: https://lore.kernel.org/20240709-feature_ptp_netnext-v17-0-b5317f50df2a@bootlin.com/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/dsa/microchip/ksz_ptp.c')
| -rw-r--r-- | drivers/net/dsa/microchip/ksz_ptp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dsa/microchip/ksz_ptp.c b/drivers/net/dsa/microchip/ksz_ptp.c index 1fe105913c75..f0bd46e5d4ec 100644 --- a/drivers/net/dsa/microchip/ksz_ptp.c +++ b/drivers/net/dsa/microchip/ksz_ptp.c @@ -293,7 +293,7 @@ static int ksz_ptp_enable_mode(struct ksz_device *dev) /* The function is return back the capability of timestamping feature when * requested through ethtool -T <interface> utility */ -int ksz_get_ts_info(struct dsa_switch *ds, int port, struct ethtool_ts_info *ts) +int ksz_get_ts_info(struct dsa_switch *ds, int port, struct kernel_ethtool_ts_info *ts) { struct ksz_device *dev = ds->priv; struct ksz_ptp_data *ptp_data; |