diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-20 16:39:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-20 16:39:59 -0400 |
| commit | b85c715c2e6fabdd18c90df878ed2c6e6cd50fc2 (patch) | |
| tree | 41f8cc32c03500c499e35e641f08f41a41f28ece /drivers/net/ethernet/sfc/ethtool.c | |
| parent | aee77e4accbeb2c86b1d294cd84fec4a12dde3bd (diff) | |
| parent | 450783747f42dfa3883920acfad4acdd93ce69af (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Ben Hutchings says:
====================
1. Extension to PPS/PTP to allow for PHC devices where pulses are
subject to a variable but measurable delay.
2. PPS/PTP/PHC support for Solarflare boards with a timestamping
peripheral.
3. MTD support for updating the timestamping peripheral on those boards.
4. Fix for potential over-length requests to firmware.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/ethtool.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c index f8e7e204981..9df556c01b8 100644 --- a/drivers/net/ethernet/sfc/ethtool.c +++ b/drivers/net/ethernet/sfc/ethtool.c @@ -1174,6 +1174,7 @@ const struct ethtool_ops efx_ethtool_ops = { .get_rxfh_indir_size = efx_ethtool_get_rxfh_indir_size, .get_rxfh_indir = efx_ethtool_get_rxfh_indir, .set_rxfh_indir = efx_ethtool_set_rxfh_indir, + .get_ts_info = efx_ptp_get_ts_info, .get_module_info = efx_ethtool_get_module_info, .get_module_eeprom = efx_ethtool_get_module_eeprom, }; |