Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[mirror_ubuntu-artful-kernel.git] / drivers / net / ethernet / mellanox / mlx4 / main.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 56160a2bb57ba9aee70155d8a80f008d04b3136b..f390785417f0117dbb4c42676a4ca4db74c9ec35 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -632,6 +632,9 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
                dev->caps.cqe_size   = 32;
        }
 
+       dev->caps.flags2 &= ~MLX4_DEV_CAP_FLAG2_TS;
+       mlx4_warn(dev, "Timestamping is not supported in slave mode.\n");
+
        slave_adjust_steering_mode(dev, &dev_cap, &hca_param);
 
        return 0;