From: Jacob Keller Date: Thu, 25 Aug 2016 21:06:54 +0000 (-0700) Subject: fm10k: use generic ethtool_op_get_ts_info callback X-Git-Tag: v4.1.12-92~3^2~88 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6dda5d61f0784c4ec1dd0a1eec2a06b29d3ed345;p=users%2Fjedix%2Flinux-maple.git fm10k: use generic ethtool_op_get_ts_info callback This generic callback is for drivers which have software Tx timestamp support enabled. Without this, PTP applications requesting software timestamps may complain that the requested mode is not supported. Signed-off-by: Jacob Keller Tested-by: Krishneil Singh Signed-off-by: Jeff Kirsher Orabug: 25394529 (cherry picked from commit bab02a69296682881cae280587618978c357e26e) Signed-off-by: Jack Vogel --- diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c index 7443b996ebc9..026e88b05737 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c @@ -1213,7 +1213,7 @@ static const struct ethtool_ops fm10k_ethtool_ops = { .set_rxfh = fm10k_set_rssh, .get_channels = fm10k_get_channels, .set_channels = fm10k_set_channels, - .get_ts_info = fm10k_get_ts_info, + .get_ts_info = ethtool_op_get_ts_info, }; void fm10k_set_ethtool_ops(struct net_device *dev)