From efa13fbab0f7947470f61bc4a02be3e042b152fc Mon Sep 17 00:00:00 2001 From: Amir Vadai Date: Thu, 25 Apr 2013 05:22:24 +0000 Subject: [PATCH] --- yaml --- r: 369767 b: refs/heads/master c: dc8142ea8906ea94a68734c1513b92b3f490fcd5 h: refs/heads/master i: 369765: ce3d5f719c8cd36ab2ec636de9277b710902a623 369763: 87dd84d2c8c3a2d8c2831854e5bbfe1164a72f75 369759: 548745c6e70caa875dd83381a04c29485d7de4c2 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 22d8cf25cd8f..ac04e2935b6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30b40c31c2eeaa9188b09c3fd1230b90b2d1823b +refs/heads/master: dc8142ea8906ea94a68734c1513b92b3f490fcd5 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index f4f88b846020..05c7c13bdbde 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -1373,7 +1373,8 @@ static void mlx4_en_service_task(struct work_struct *work) mutex_lock(&mdev->state_lock); if (mdev->device_up) { - mlx4_en_ptp_overflow_check(mdev); + if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS) + mlx4_en_ptp_overflow_check(mdev); queue_delayed_work(mdev->workqueue, &priv->service_task, SERVICE_TASK_DELAY); @@ -2228,8 +2229,11 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, } mlx4_en_set_default_moderation(priv); queue_delayed_work(mdev->workqueue, &priv->stats_task, STATS_DELAY); - queue_delayed_work(mdev->workqueue, &priv->service_task, - SERVICE_TASK_DELAY); + + if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS) + queue_delayed_work(mdev->workqueue, &priv->service_task, + SERVICE_TASK_DELAY); + return 0; out: