diff options
author | David S. Miller <davem@davemloft.net> | 2017-02-03 00:54:00 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-03 00:54:00 +0300 |
commit | e2160156bf2a7d5018e99a9993fbcdda0abac09b (patch) | |
tree | 1a70cb13dcfa7ade4c48d8a64d20543abebfb1dc /drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c | |
parent | 62e13097c46c69dbd7544ab2cd585ccf48f360a4 (diff) | |
parent | 6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff) | |
download | linux-e2160156bf2a7d5018e99a9993fbcdda0abac09b.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c index 4b4323f3c158..d55fff0ba388 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c @@ -92,7 +92,7 @@ static struct mlx5e_ethtool_table *get_flow_table(struct mlx5e_priv *priv, ns = mlx5_get_flow_namespace(priv->mdev, MLX5_FLOW_NAMESPACE_ETHTOOL); if (!ns) - return ERR_PTR(-ENOTSUPP); + return ERR_PTR(-EOPNOTSUPP); table_size = min_t(u32, BIT(MLX5_CAP_FLOWTABLE(priv->mdev, flow_table_properties_nic_receive.log_max_ft_size)), |