1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 886e1bc86374..7869f97de5da 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -2072,6 +2072,9 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
         /* flush any pending task for this netdev */
         flush_workqueue(mdev->workqueue);
 
+        if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS)
+                mlx4_en_remove_timestamp(mdev);
+
         /* Detach the netdev so tasks would not attempt to access it */
         mutex_lock(&mdev->state_lock);
         mdev->pndev[priv->port] = NULL;
@@ -3058,9 +3061,12 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         }
         queue_delayed_work(mdev->workqueue, &priv->stats_task, STATS_DELAY);
 
+        /* Initialize time stamp mechanism */
         if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS)
-                queue_delayed_work(mdev->workqueue, &priv->service_task,
-                                   SERVICE_TASK_DELAY);
+                mlx4_en_init_timestamp(mdev);
+
+        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,