[PATCH 1/2] net/mlx4_en: Remove dependency between timestamping capability and service_task

Talat Batheesh talatb at mellanox.com
Sun Mar 6 15:28:46 UTC 2016


From: Eugenia Emantayev <eugenia at mellanox.com>

Subject: [trusty] [PATCH 1/2] (upstream) Fixing PTP and timekeeper after reboot.

BugLink: http://bugs.launchpad.net/bugs/1537859

commit 90683061dd50b0d70f01466c2d694f4e928a86f3 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 at mellanox.com>
Signed-off-by: Eran Ben Elisha <eranbe at mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz at mellanox.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
(cherry picked from commit fc9f5ea9b4ecbe9b7839c92f0a54261809c723d3)
Signed-off-by: Talat Batheesh <talatb at mellanox.com>
---
 drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 5 ++---
 1 file 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 107e555..3addab7 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -2656,9 +2656,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) {
-- 
2.5.0





More information about the kernel-team mailing list