diff options
| author | Eugenia Emantayev | 2015-12-17 14:35:37 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-12-18 20:48:03 +0100 |
| commit | fc9f5ea9b4ecbe9b7839c92f0a54261809c723d3 (patch) | |
| tree | 04000e8d518128536f5fee8490c614721518b25f /drivers/net/ethernet/mellanox/mlx4 | |
| parent | Merge branch 'cpsw-fixed-phy-dt-bugs' (diff) | |
| download | kernel-qcow2-linux-fc9f5ea9b4ecbe9b7839c92f0a54261809c723d3.tar.gz kernel-qcow2-linux-fc9f5ea9b4ecbe9b7839c92f0a54261809c723d3.tar.xz kernel-qcow2-linux-fc9f5ea9b4ecbe9b7839c92f0a54261809c723d3.zip | |
net/mlx4_en: Remove dependency between timestamping capability and service_task
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>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index 886e1bc86374..4eef316bbc82 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -3058,9 +3058,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); mlx4_en_set_stats_bitmap(mdev->dev, &priv->stats_bitmap, mdev->profile.prof[priv->port].rx_ppp, |