net/mlx5e: Remove the false indication of software timestamping support
authorAlaa Hleihel <alaa@mellanox.com>
Sun, 25 Nov 2018 09:46:09 +0000 (11:46 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 Jan 2019 15:16:41 +0000 (16:16 +0100)
[ 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

index da1d73fe1a812eff4317d9b8f3294517cfb870e6..d5e8ac86c1952d6fde3c874062c618902e555d86 100644 (file)
@@ -1167,11 +1167,6 @@ static int mlx5e_get_ts_info(struct net_device *dev,
                             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_device *dev,
        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);