From: Eugenia Emantayev Date: Thu, 17 Dec 2015 13:35:37 +0000 (+0200) Subject: net/mlx4_en: Remove dependency between timestamping capability and service_task X-Git-Tag: v3.16.35~710 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07ca1483e36586905e705a520cb121edd66c123e;p=thirdparty%2Fkernel%2Fstable.git net/mlx4_en: Remove dependency between timestamping capability and service_task commit fc9f5ea9b4ecbe9b7839c92f0a54261809c723d3 upstream. Service task is responsible for other tasks in addition to timestamping overflow check. Launch it even if timestamping is not supported by device. Fixes: 07841f9d94c1 ('net/mlx4_en: Schedule napi when RX buffers allocation fails') Signed-off-by: Eugenia Emantayev Signed-off-by: Eran Ben Elisha Signed-off-by: Or Gerlitz Signed-off-by: David S. Miller Signed-off-by: Luis Henriques --- diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index 8be0c179e25d6..3e663928b51e5 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -2655,9 +2655,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, } queue_delayed_work(mdev->workqueue, &priv->stats_task, STATS_DELAY); - if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS) - queue_delayed_work(mdev->workqueue, &priv->service_task, - SERVICE_TASK_DELAY); + queue_delayed_work(mdev->workqueue, &priv->service_task, + SERVICE_TASK_DELAY); err = register_netdev(dev); if (err) {