diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-07-15 16:13:00 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-07-15 17:02:30 +0200 |
| commit | 30b3560050486275c6207c8c90c0d53a7cc73ac1 (patch) | |
| tree | ba82e7543efefbd0cdfc4627f9fecc4df20b2da2 /include/net/dsa.h | |
| parent | net: ethernet: lantiq_etop: remove redundant device name setup (diff) | |
| parent | net: Add struct kernel_ethtool_ts_info (diff) | |
| download | linux-30b3560050486275c6207c8c90c0d53a7cc73ac1.tar.xz 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 'include/net/dsa.h')
| -rw-r--r-- | include/net/dsa.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index 5a5a03a7b4c3..b06f97ae3da1 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -936,7 +936,7 @@ struct dsa_switch_ops { * ethtool timestamp info */ int (*get_ts_info)(struct dsa_switch *ds, int port, - struct ethtool_ts_info *ts); + struct kernel_ethtool_ts_info *ts); /* * ethtool MAC merge layer |