lkml.org 
[lkml]   [2018]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 30/92] net/mlx5: Fix required capability for manipulating MPFS
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Eli Cohen <eli@mellanox.com>

    [ Upstream commit f811980444ec59ad62f9e041adbb576a821132c7 ]

    Manipulating of the MPFS requires eswitch manager capabilities.

    Fixes: eeb66cdb6826 ('net/mlx5: Separate between E-Switch and MPFS')
    Signed-off-by: Eli Cohen <eli@mellanox.com>
    Reviewed-by: Or Gerlitz <ogerlitz@mellanox.com>
    Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
    @@ -34,6 +34,7 @@
    #include <linux/mlx5/driver.h>
    #include <linux/mlx5/mlx5_ifc.h>
    #include "mlx5_core.h"
    +#include "eswitch.h"
    #include "lib/mpfs.h"

    /* HW L2 Table (MPFS) management */
    @@ -98,7 +99,7 @@ int mlx5_mpfs_init(struct mlx5_core_dev
    int l2table_size = 1 << MLX5_CAP_GEN(dev, log_max_l2_table);
    struct mlx5_mpfs *mpfs;

    - if (!MLX5_VPORT_MANAGER(dev))
    + if (!MLX5_ESWITCH_MANAGER(dev))
    return 0;

    mpfs = kzalloc(sizeof(*mpfs), GFP_KERNEL);
    @@ -122,7 +123,7 @@ void mlx5_mpfs_cleanup(struct mlx5_core_
    {
    struct mlx5_mpfs *mpfs = dev->priv.mpfs;

    - if (!MLX5_VPORT_MANAGER(dev))
    + if (!MLX5_ESWITCH_MANAGER(dev))
    return;

    WARN_ON(!hlist_empty(mpfs->hash));
    @@ -137,7 +138,7 @@ int mlx5_mpfs_add_mac(struct mlx5_core_d
    u32 index;
    int err;

    - if (!MLX5_VPORT_MANAGER(dev))
    + if (!MLX5_ESWITCH_MANAGER(dev))
    return 0;

    mutex_lock(&mpfs->lock);
    @@ -179,7 +180,7 @@ int mlx5_mpfs_del_mac(struct mlx5_core_d
    int err = 0;
    u32 index;

    - if (!MLX5_VPORT_MANAGER(dev))
    + if (!MLX5_ESWITCH_MANAGER(dev))
    return 0;

    mutex_lock(&mpfs->lock);

    \
     
     \ /
      Last update: 2018-07-20 14:35    [W:4.117 / U:0.428 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site