diff options
| author | Jakub Kicinski <[email protected]> | 2024-07-15 14:13:00 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-07-15 15:02:30 +0000 |
| commit | 30b3560050486275c6207c8c90c0d53a7cc73ac1 (patch) | |
| tree | ba82e7543efefbd0cdfc4627f9fecc4df20b2da2 /drivers/net/ethernet/intel/igc | |
| parent | net: ethernet: lantiq_etop: remove redundant device name setup (diff) | |
| parent | net: Add struct kernel_ethtool_ts_info (diff) | |
| download | kernel-30b3560050486275c6207c8c90c0d53a7cc73ac1.tar.gz kernel-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/[email protected]/
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/igc')
| -rw-r--r-- | drivers/net/ethernet/intel/igc/igc_ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c index ab17170fe7e6..3d3ef4e1547c 100644 --- a/drivers/net/ethernet/intel/igc/igc_ethtool.c +++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c @@ -1559,7 +1559,7 @@ static int igc_ethtool_set_channels(struct net_device *netdev, } static int igc_ethtool_get_ts_info(struct net_device *dev, - struct ethtool_ts_info *info) + struct kernel_ethtool_ts_info *info) { struct igc_adapter *adapter = netdev_priv(dev); |