lkml.org 
[lkml]   [2016]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 110/128] net/mlx4_en: Remove dependency between timestamping capability and service_task
    Date
    3.16.7-ckt23 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Eugenia Emantayev <eugenia@mellanox.com>

    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 | 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 8be0c179e25d..3e663928b51e 100644
    --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
    +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
    @@ -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) {
    \
     
     \ /
      Last update: 2016-01-25 00:01    [W:4.096 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site