| From foo@baz Fri Jan 4 20:27:35 CET 2019 |
| From: Alaa Hleihel <alaa@mellanox.com> |
| Date: Sun, 25 Nov 2018 11:46:09 +0200 |
| Subject: net/mlx5e: Remove the false indication of software timestamping support |
| |
| From: Alaa Hleihel <alaa@mellanox.com> |
| |
| [ Upstream commit 4765420439e758bfa4808392d18b0a4cb6f06065 ] |
| |
| mlx5 driver falsely advertises support of software timestamping. |
| Fix it by removing the false indication. |
| |
| Fixes: ef9814deafd0 ("net/mlx5e: Add HW timestamping (TS) support") |
| Signed-off-by: Alaa Hleihel <alaa@mellanox.com> |
| Reviewed-by: Tariq Toukan <tariqt@mellanox.com> |
| Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 11 +++-------- |
| 1 file changed, 3 insertions(+), 8 deletions(-) |
| |
| --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c |
| +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c |
| @@ -1167,11 +1167,6 @@ static int mlx5e_get_ts_info(struct net_ |
| struct ethtool_ts_info *info) |
| { |
| struct mlx5e_priv *priv = netdev_priv(dev); |
| - int ret; |
| - |
| - ret = ethtool_op_get_ts_info(dev, info); |
| - if (ret) |
| - return ret; |
| |
| info->phc_index = priv->tstamp.ptp ? |
| ptp_clock_index(priv->tstamp.ptp) : -1; |
| @@ -1179,9 +1174,9 @@ static int mlx5e_get_ts_info(struct net_ |
| if (!MLX5_CAP_GEN(priv->mdev, device_frequency_khz)) |
| return 0; |
| |
| - info->so_timestamping |= SOF_TIMESTAMPING_TX_HARDWARE | |
| - SOF_TIMESTAMPING_RX_HARDWARE | |
| - SOF_TIMESTAMPING_RAW_HARDWARE; |
| + info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE | |
| + SOF_TIMESTAMPING_RX_HARDWARE | |
| + SOF_TIMESTAMPING_RAW_HARDWARE; |
| |
| info->tx_types = BIT(HWTSTAMP_TX_OFF) | |
| BIT(HWTSTAMP_TX_ON); |
