lkml.org 
[lkml]   [2019]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 168/243] net/mlx4_core: Fix return codes of unsupported operations
    Date
    From: Erez Alfasi <ereza@mellanox.com>

    [ Upstream commit 95aac2cdafd8c8298c9b2589c52f44db0d824e0e ]

    Functions __set_port_type and mlx4_check_port_params returned
    -EINVAL while the proper return code is -EOPNOTSUPP as a
    result of an unsupported operation. All drivers should generate
    this and all users should check for it when detecting an
    unsupported functionality.

    Signed-off-by: Erez Alfasi <ereza@mellanox.com>
    Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/mellanox/mlx4/main.c | 11 +++++------
    1 file changed, 5 insertions(+), 6 deletions(-)

    diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
    index 6a046030e8734..4afe56a6eedfb 100644
    --- a/drivers/net/ethernet/mellanox/mlx4/main.c
    +++ b/drivers/net/ethernet/mellanox/mlx4/main.c
    @@ -313,7 +313,7 @@ int mlx4_check_port_params(struct mlx4_dev *dev,
    for (i = 0; i < dev->caps.num_ports - 1; i++) {
    if (port_type[i] != port_type[i + 1]) {
    mlx4_err(dev, "Only same port types supported on this HCA, aborting\n");
    - return -EINVAL;
    + return -EOPNOTSUPP;
    }
    }
    }
    @@ -322,7 +322,7 @@ int mlx4_check_port_params(struct mlx4_dev *dev,
    if (!(port_type[i] & dev->caps.supported_type[i+1])) {
    mlx4_err(dev, "Requested port type for port %d is not supported on this HCA\n",
    i + 1);
    - return -EINVAL;
    + return -EOPNOTSUPP;
    }
    }
    return 0;
    @@ -1188,8 +1188,7 @@ static int __set_port_type(struct mlx4_port_info *info,
    mlx4_err(mdev,
    "Requested port type for port %d is not supported on this HCA\n",
    info->port);
    - err = -EINVAL;
    - goto err_sup;
    + return -EOPNOTSUPP;
    }

    mlx4_stop_sense(mdev);
    @@ -1211,7 +1210,7 @@ static int __set_port_type(struct mlx4_port_info *info,
    for (i = 1; i <= mdev->caps.num_ports; i++) {
    if (mdev->caps.possible_type[i] == MLX4_PORT_TYPE_AUTO) {
    mdev->caps.possible_type[i] = mdev->caps.port_type[i];
    - err = -EINVAL;
    + err = -EOPNOTSUPP;
    }
    }
    }
    @@ -1237,7 +1236,7 @@ static int __set_port_type(struct mlx4_port_info *info,
    out:
    mlx4_start_sense(mdev);
    mutex_unlock(&priv->port_mutex);
    -err_sup:
    +
    return err;
    }

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-11 16:23    [W:4.920 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site