]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net/mlx4_en: Remove dependency between timestamping capability and service_task
authorEugenia Emantayev <eugenia@mellanox.com>
Thu, 17 Dec 2015 13:35:37 +0000 (15:35 +0200)
committerLuis Henriques <luis.henriques@canonical.com>
Mon, 25 Jan 2016 10:43:59 +0000 (10:43 +0000)
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 <eugenia@mellanox.com>
Signed-off-by: Eran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/net/ethernet/mellanox/mlx4/en_netdev.c

index 8be0c179e25d66e73fcd1943442b9bcb8977d9c5..3e663928b51e539e7b121469cffba343c8ce7769 100644 (file)
@@ -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) {